diff --git a/main-command/src/main/scala/sbt/internal/server/Server.scala b/main-command/src/main/scala/sbt/internal/server/Server.scala
index 51e2160db..3873f166a 100644
--- a/main-command/src/main/scala/sbt/internal/server/Server.scala
+++ b/main-command/src/main/scala/sbt/internal/server/Server.scala
@@ -114,8 +114,8 @@ private[sbt] object Server {
                   val socket = serverSocket.accept()
                   onIncomingSocket(socket, self)
                 } catch {
-                  case e: IOException if e.getMessage.contains("connect") =>
-                  case _: SocketTimeoutException                          => // its ok
+                  case e: IOException if Option(e.getMessage).exists(_.contains("connect")) =>
+                  case _: SocketTimeoutException          => // its ok
                   case _: SocketException if !running.get => // the server is shutting down
                 }
               }