diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 6d10dcf..211fd3c 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -1133,8 +1133,9 @@
       (set-buffer curbuf))))
 
 (defun py-postprocess-output-buffer (buf)
-  ;; Highlight exceptions found in BUF
-  (let (line file bol)
+  ;; Highlight exceptions found in BUF.  If an exception occurred
+  ;; return t, otherwise return nil.  BUF must exist.
+  (let (line file bol err-p)
     (save-excursion
       (set-buffer buf)
       (beginning-of-buffer)
@@ -1142,11 +1143,12 @@
 	(setq file (match-string 1)
 	      line (string-to-int (match-string 2))
 	      bol (py-point 'bol))
-	(py-highlight-line bol (py-point 'eol) file line))
-      (when (and py-jump-on-exception line)
-	(beep)
-	(py-jump-to-exception file line))
-      )))
+	(py-highlight-line bol (py-point 'eol) file line)))
+    (when (and py-jump-on-exception line)
+      (beep)
+      (py-jump-to-exception file line)
+      (setq err-p t))
+    err-p))
 
 
 
@@ -1263,8 +1265,10 @@
       (if (not (get-buffer py-output-buffer))
 	  (message "No output.")
 	(setq py-exception-buffer (current-buffer))
-	(py-postprocess-output-buffer py-output-buffer)
-	(pop-to-buffer py-output-buffer)
+	(let ((err-p (py-postprocess-output-buffer py-output-buffer)))
+	  (pop-to-buffer py-output-buffer)
+	  (if err-p
+	      (pop-to-buffer py-exception-buffer)))
 	))
      )))