2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7f2a7536717..df35e998c31 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-14  Chong Yidong  <cyd@gnu.org>
+
+        * gnus-art.el (article-display-face): Handle failure in
+        gnus-create-image (Bug#11802).
+
 2012-08-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * gnus-agent.el (gnus-agent-cat-defaccessor, gnus-agent-cat-groups):
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index bb374fba11b..b9020a40b75 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2437,9 +2437,10 @@ long lines if and only if arg is positive."
                         (apply 'gnus-create-image png 'png t
                                (cdr (assq 'png gnus-face-properties-alist))))
                   (goto-char from)
-                  (gnus-add-wash-type 'face)
-                  (gnus-add-image 'face image)
-                  (gnus-put-image image nil 'face))))))))))
+                  (when image
+                    (gnus-add-wash-type 'face)
+                    (gnus-add-image 'face image)
+                    (gnus-put-image image nil 'face)))))))))))
 
 (defun article-display-x-face (&optional force)
   "Look for an X-Face header and display it if present."