diff --git a/magit.el b/magit.el
index a67d961f..98c1a466 100644
--- a/magit.el
+++ b/magit.el
@@ -3575,10 +3575,7 @@ Prefix arg means justify as well."
 (defun magit--branch-name-at-point ()
   "Get the branch name in the line at point."
   (let ((branch (magit--branch-name-from-line (thing-at-point 'line))))
-    (if (or (= (point) (point-max))
-	    (not branch))
-      (error "No branch found in current line"))
-    branch))
+    (or branch (error "No branch at point"))))
 
 (defun magit-branches-window-checkout ()
   "Check out the branch in the line at point."