diff --git a/Lib/ssl.py b/Lib/ssl.py
index 21ae4053750..03a317b7e06 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -103,7 +103,7 @@ def __init__(self, sock, keyfile=None, certfile=None,
         # see if it's connected
         try:
             socket.getpeername(self)
-        except:
+        except socket.error:
             # no, no connection yet
             self._sslobj = None
         else:
@@ -441,7 +441,7 @@ def sslwrap_simple (sock, keyfile=None, certfile=None):
                             PROTOCOL_SSLv23, None)
     try:
         sock.getpeername()
-    except:
+    except socket.error:
         # no, no connection yet
         pass
     else: