diff --git a/main-command/src/main/scala/sbt/State.scala b/main-command/src/main/scala/sbt/State.scala
index 9cee3f725..11d0de3eb 100644
--- a/main-command/src/main/scala/sbt/State.scala
+++ b/main-command/src/main/scala/sbt/State.scala
@@ -228,7 +228,8 @@ object State {
     def fail =
       {
         import BasicCommandStrings.Compat.{ FailureWall => CompatFailureWall }
-        val remaining = s.remainingCommands.dropWhile(c => c != FailureWall && c != CompatFailureWall)
+        val remaining =
+          s.remainingCommands.dropWhile(c => c.commandLine != FailureWall && c.commandLine != CompatFailureWall)
         if (remaining.isEmpty)
           applyOnFailure(s, Nil, exit(ok = false))
         else