diff --git a/Lib/ssl.py b/Lib/ssl.py
index f06792e4819..8ab32549955 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -82,6 +82,7 @@
 from socket import socket, AF_INET, SOCK_STREAM
 import base64        # for DER-to-PEM translation
 import traceback
+import errno
 
 class SSLSocket(socket):
 
@@ -116,7 +117,9 @@ def __init__(self, sock=None, keyfile=None, certfile=None,
         # see if it's connected
         try:
             socket.getpeername(self)
-        except socket_error:
+        except socket_error as e:
+            if e.errno != errno.ENOTCONN:
+                raise
             # no, no connection yet
             self._sslobj = None
         else: