diff --git a/doc/THANKS b/doc/THANKS
index a6d95dbf9..a80abcaf1 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -373,6 +373,9 @@ mariano <marianoso@gmail.com>
 mitchell <mitchell@tufala.net>
     for reporting a bug
 
+nightman <nightman@email.de>
+    for reporting a bug
+
 pacman730 <pacman730@users.sourceforge.net>
     for reporting a bug
 
diff --git a/extra/keepalive/keepalive.py b/extra/keepalive/keepalive.py
index 8cdc41f97..e53e419fd 100644
--- a/extra/keepalive/keepalive.py
+++ b/extra/keepalive/keepalive.py
@@ -152,7 +152,7 @@ class HTTPHandler(urllib2.HTTPHandler):
             if not h is None:
                 try:
                     self._start_connection(h, req)
-                except socket.error, e:
+                except:
                     r = None
                 else:
                     try: r = h.getresponse()