(py-beginning-of-def-or-class): Only move to match-beginning if the
regex match actually succeeded!
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index d30c1b3..643f2f2 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -2164,8 +2164,8 @@
 	     (zerop (current-column))
 	     (looking-at start-re))
 	(end-of-line))
-    (re-search-backward start-re nil 'move count)
-    (goto-char (match-beginning 0))))
+    (if (re-search-backward start-re nil 'move count)
+	(goto-char (match-beginning 0)))))
 
 ;; Backwards compatibility
 (defalias 'beginning-of-python-def-or-class 'py-beginning-of-def-or-class)