X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=d061367e82a3da89db04bdd27ede1ab6ea67604b;hp=f273eb406cb0daf38aec0a3f13286df7a49a556f;hb=7c6ac9fbae354cf0f5dd1686476a99f2420bc689;hpb=96864a9aea20f477d5542e5fb390becf20942337

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index f273eb40..d061367e 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -815,7 +815,12 @@ message at DEPTH in the current thread."
     ;; Run the content handlers until one of them returns a non-nil
     ;; value.
     (while (and handlers
-		(not (funcall (car handlers) msg part content-type nth depth declared-type)))
+		(not (condition-case err
+			 (funcall (car handlers) msg part content-type nth depth declared-type)
+		       (error (progn
+				(insert "!!! Bodypart insert error: ")
+				(insert (error-message-string err))
+				(insert " !!!\n") nil)))))
       (setq handlers (cdr handlers))))
   t)