--- a/test/jdk/java/net/httpclient/MockServer.java	Tue Jun 26 13:19:01 2018 +0100
+++ b/test/jdk/java/net/httpclient/MockServer.java	Wed Jun 27 21:24:56 2018 +0100
@@ -284,7 +284,7 @@
             }
             try {
                 socket.close();
-            } catch (IOException e) {}
+            } catch (Throwable e) {}
             synchronized (removals) {
                 removals.add(this);
             }
@@ -339,7 +339,7 @@
         closed = true;
         try {
             ss.close();
-        } catch (IOException e) {
+        } catch (Throwable e) {
             e.printStackTrace();
         }
         for (Connection c : sockets) {