--- a/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java	Fri Jun 22 18:19:26 2018 +0200
+++ b/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java	Fri Jun 22 18:10:20 2018 +0100
@@ -37,6 +37,7 @@
 import sun.net.ConnectionResetException;
 import sun.net.NetHooks;
 import sun.net.ResourceManager;
+import sun.net.util.SocketExceptions;
 
 /**
  * Default Socket Implementation. This implementation does
@@ -415,7 +416,7 @@
             }
         } catch (IOException e) {
             close();
-            throw e;
+            throw SocketExceptions.of(e, new InetSocketAddress(address, port));
         }
     }