diff --git a/magit.el b/magit.el
index 12650570..31802c00 100644
--- a/magit.el
+++ b/magit.el
@@ -931,13 +931,14 @@ Many Magit faces inherit from this one by default."
 
 (defun magit-run* (cmd-and-args
 		   &optional logline noerase noerror nowait input)
+  (if (and magit-process
+	   (get-buffer "*magit-process*"))
+      (error "Git is already running."))
   (let ((cmd (car cmd-and-args))
 	(args (cdr cmd-and-args))
 	(dir default-directory)
 	(buf (get-buffer-create "*magit-process*"))
 	(successp nil))
-    (or (not magit-process)
-	(error "Git is already running."))
     (magit-set-mode-line-process
      (magit-process-indicator-from-command cmd-and-args))
     (setq magit-process-client-buffer (current-buffer))