diff --git a/build.gradle b/build.gradle
index e2278ff..144a90e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -183,19 +183,16 @@ def serverStart(String serverName) {
         writer = proc.getOutputStream().newWriter()
         writer.write("stop\n")
         writer.flush()
-
-        while (proc.alive) {
-            Thread.sleep(10)
-        }
-        proc.closeStreams()
-        outputThread.interrupt()
-        inputThread.interrupt()
+        awaitClose(proc, outputThread, inputThread)
     }
+    awaitClose(proc, outputThread, inputThread)
+}
 
+private static def awaitClose(Process proc, Thread outputThread, Thread inputThread) {
     while (proc.alive) {
         Thread.sleep(10)
     }
-
+    proc.closeStreams()
     outputThread.interrupt()
     inputThread.interrupt()
 }