diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index f2e7a2e9e..f33aee75f 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -85,8 +85,7 @@ private[sbt] object xMain {
         ITerminal.withStreams(true, isSubProcess = detachStdio) {
           if (clientModByEnv || userCommands.exists(isClient)) {
             val args = userCommands.toList.filterNot(isClient)
-            NetworkClient.run(dealiasBaseDirectory(configuration), args)
-            Exit(0)
+            Exit(NetworkClient.run(dealiasBaseDirectory(configuration), args))
           } else {
             val state0 = StandardMain
               .initialState(