--- /usr/share/emacs21/site-lisp/w3-el/w3-display.el.old	2005-05-25 02:42:19.000000000 +0200
+++ /usr/share/emacs21/site-lisp/w3-el/w3-display.el	2005-12-03 14:14:25.000000000 +0100
@@ -985,8 +985,8 @@
 (defmacro w3-handle-image ()
   `(let* ((height (w3-get-attribute 'height))
 	  (width (w3-get-attribute 'width))
-	  (src (or (w3-get-attribute 'src) "Error Image"))
+	  (src (w3-get-attribute 'src))
 	  (alt (w3-image-alt src))
 	  (ismap (and (assq 'ismap args) 'ismap))
 	  (usemap (w3-get-attribute 'usemap))
--- /usr/share/emacs21/site-lisp/w3-el/w3-imap.el.old	2001-05-14 19:29:25.000000000 +0200
+++ /usr/share/emacs21/site-lisp/w3-el/w3-imap.el	2005-12-03 14:14:58.000000000 +0100
@@ -209,13 +209,14 @@
   `(cdr-safe (assoc ,href w3-graphics-list)))
 
 (defun w3-image-loadable-p (href force)
-  (let ((attribs (url-file-attributes href)))
-    (or force
-	(assoc (nth 8 attribs) w3-allowed-image-types)
-	(null w3-image-size-restriction)
-	(<= (nth 7 attribs) 0)
-	(and (numberp w3-image-size-restriction)
-	     (<= (nth 7 attribs) w3-image-size-restriction)))))
+  (and href
+       (let ((attribs (url-file-attributes href)))
+	 (or force
+	     (assoc (nth 8 attribs) w3-allowed-image-types)
+	     (null w3-image-size-restriction)
+	     (<= (nth 7 attribs) 0)
+	     (and (numberp w3-image-size-restriction)
+		  (<= (nth 7 attribs) w3-image-size-restriction))))))
 
 (defmacro w3-image-invalid-glyph-p (glyph)
   `(if (vectorp glyph)