diff --git a/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt b/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt
index b653356d..2690952a 100644
--- a/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/remote/KobaltServer.kt
@@ -63,6 +63,9 @@ public class KobaltServer @Inject constructor(val args: Args) : Runnable, IComma
                         line = ins.readLine()
                     }
                 }
+                if (line == null) {
+                    quit = true
+                }
             } catch(ex: SocketException) {
                 log(1, "Client disconnected, resetting")
                 clientSocket = serverSocket.accept()