diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
index 477df7238..ff5c5661b 100644
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@@ -9,7 +9,8 @@ package sbt
 package internal
 package client
 
-import java.net.{ URI, Socket, InetAddress, SocketException }
+import java.io.IOException
+import java.net.{ URI, Socket, InetAddress }
 import java.util.UUID
 import java.util.concurrent.atomic.{ AtomicBoolean, AtomicReference }
 import scala.collection.mutable.ListBuffer
@@ -111,7 +112,7 @@ class NetworkClient(arguments: List[String]) { self =>
     try {
       connection.publish(bytes)
     } catch {
-      case _: SocketException =>
+      case _: IOException =>
       // log.debug(e.getMessage)
       // toDel += client
     }
diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala
index f03546b64..7bbb2c38b 100644
--- a/main/src/main/scala/sbt/internal/CommandExchange.scala
+++ b/main/src/main/scala/sbt/internal/CommandExchange.scala
@@ -8,7 +8,7 @@
 package sbt
 package internal
 
-import java.net.SocketException
+import java.io.IOException
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicInteger
 import scala.collection.mutable.ListBuffer
@@ -170,7 +170,7 @@ private[sbt] final class CommandExchange {
         try {
           c.notifyEvent(method, params)
         } catch {
-          case _: SocketException =>
+          case _: IOException =>
             toDel += c
         }
     }
@@ -213,7 +213,7 @@ private[sbt] final class CommandExchange {
                 }
               }
             } catch {
-              case _: SocketException =>
+              case _: IOException =>
                 toDel += c
             }
         }
@@ -225,7 +225,7 @@ private[sbt] final class CommandExchange {
             try {
               c.publishEvent(event)
             } catch {
-              case _: SocketException =>
+              case _: IOException =>
                 toDel += c
             }
         }
@@ -267,7 +267,7 @@ private[sbt] final class CommandExchange {
         try {
           c.publishObjectEvent(event)
         } catch {
-          case _: SocketException =>
+          case _: IOException =>
             toDel += c
         }
     }
@@ -305,7 +305,7 @@ private[sbt] final class CommandExchange {
                 c.publishEventMessage(event)
               }
             } catch {
-              case e: SocketException =>
+              case e: IOException =>
                 toDel += c
             }
         }
@@ -317,7 +317,7 @@ private[sbt] final class CommandExchange {
             try {
               c.publishEventMessage(event)
             } catch {
-              case _: SocketException =>
+              case _: IOException =>
                 toDel += c
             }
         }