2 files changed, 12 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34e391a8c57..5d0d00be9dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-10  Glenn Morris  <rgm@gnu.org>
+
+        * mail/emacsbug.el (report-emacs-bug): Trap load-path-shadows errors.
+
 2012-09-08  Alan Mackenzie  <acm@muc.de>
 
         AWK Mode: make auto-newline work when there's "==" in the pattern.
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 1a02ae7c519..742c05bc8d5 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -304,9 +304,14 @@ usually do not have translators for other languages.\n\n")))
       (insert "\n"))
     (insert "\n")
     (insert "Load-path shadows:\n")
-    (message "Checking for load-path shadows...")
-    (let ((shadows (list-load-path-shadows t)))
-      (message "Checking for load-path shadows...done")
+    (let* ((msg "Checking for load-path shadows...")
+           (result "done")
+           (shadows (progn (message "%s" msg)
+                           (condition-case nil (list-load-path-shadows t)
+                             (error
+                              (setq result "error")
+                              "Error during checking")))))
+      (message "%s%s" msg result)
       (insert (if (zerop (length shadows))
                   "None found.\n"
                 shadows)))