diff --git a/CmdLine/Action.hs b/CmdLine/Action.hs
index 98c3fa23fe..9d45558787 100644
--- a/CmdLine/Action.hs
+++ b/CmdLine/Action.hs
@@ -131,10 +131,12 @@ includeCommandAction a = account =<< tryNonAsync (callCommandAction a)
   where
 	account (Right True) = return True
 	account (Right False) = incerr
-	account (Left err) = do
-		toplevelWarning True (show err)
-		implicitMessage showEndFail
-		incerr
+	account (Left err) = case fromException err of
+		Just exitcode -> liftIO $ exitWith exitcode
+		Nothing -> do
+			toplevelWarning True (show err)
+			implicitMessage showEndFail
+			incerr
 	incerr = do
 		Annex.incError
 		return False
diff --git a/doc/bugs/standalone_debian_pkg_build_fails_in_sid.mdwn b/doc/bugs/standalone_debian_pkg_build_fails_in_sid.mdwn
index dbeeac3aa4..8bcd1d2f31 100644
--- a/doc/bugs/standalone_debian_pkg_build_fails_in_sid.mdwn
+++ b/doc/bugs/standalone_debian_pkg_build_fails_in_sid.mdwn
@@ -31,3 +31,4 @@ So it is `All 293 tests passed (264.37s)` but then some additional test fails
 Note that was 7.20181105+git134-gf39db41d2 and i386
 
 
+> [[fixed|done]] --[[Joey]]
diff --git a/doc/bugs/standalone_debian_pkg_build_fails_in_sid/comment_2_640cb84ba5ea82254f0571784046fa99._comment b/doc/bugs/standalone_debian_pkg_build_fails_in_sid/comment_2_640cb84ba5ea82254f0571784046fa99._comment
index b4839e1823..e3c2000e54 100644
--- a/doc/bugs/standalone_debian_pkg_build_fails_in_sid/comment_2_640cb84ba5ea82254f0571784046fa99._comment
+++ b/doc/bugs/standalone_debian_pkg_build_fails_in_sid/comment_2_640cb84ba5ea82254f0571784046fa99._comment
@@ -6,4 +6,7 @@
 This is a reversion due to [[!commit 39fbaa0682198ba0fd8aa437b8382b13fb71e66f]]
 that breaks any part of a git-annex command that uses exitWith since that
 is actually implemented as an exception which now gets caught.
+
+(Seems that when I tried the test suite after that commit I stopped reading
+at the "All 293 tests passed" because it does always go on to fail.)
 """]]