diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 70faf2c..f7448f1 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -355,7 +355,7 @@
 
 ;; Regexp that describes tracebacks
 (defconst py-traceback-line-re
-  "[ \t]+File \"\\([^\"]+\\)\", line \\([0-9]+\\), in ")
+  "[ \t]+File \"\\([^\"]+\\)\", line \\([0-9]+\\)")
 
 
 
@@ -1242,7 +1242,7 @@
 	 (buffer (if proc "*Python*" py-output-buffer)))
     (if top
 	(py-find-next-exception 'bob buffer 're-search-forward "Top")
-      (py-find-next-exception 'boi buffer 're-search-backward "Top"))))
+      (py-find-next-exception 'bol buffer 're-search-backward "Top"))))
 
 
 ;; Electric deletion