--- keepalive.py.orig	2004-01-07 16:29:51.000000000 -0500
+++ keepalive.py	2004-01-07 16:30:47.000000000 -0500
@@ -99,6 +99,8 @@
                 h.putrequest('GET', req.get_selector())
         except socket.error, err:
             raise urllib2.URLError(err)
+        except httplib.HTTPException, err:
+            raise urllib2.URLError(err)
 
         for args in self.parent.addheaders:
             h.putheader(*args)
@@ -119,7 +121,7 @@
             if not h is None:
                 try:
                     self._start_connection(h, req)
-                except socket.error, e:
+                except urllib2.URLError, e:
                     r = None
                 else:
                     try: r = h.getresponse()
@@ -143,6 +145,8 @@
                 r = h.getresponse()
         except socket.error, err:
             raise urllib2.URLError(err)
+        except httplib.HTTPException, err:
+            raise urllib2.URLError(err)
             
         # if not a persistent connection, don't try to reuse it
         if r.will_close: self._remove_connection(host)