diff --git a/pupy/pupylib/PupyOffload.py b/pupy/pupylib/PupyOffload.py
index 71c92d6c..ad02e530 100644
--- a/pupy/pupylib/PupyOffload.py
+++ b/pupy/pupylib/PupyOffload.py
@@ -198,7 +198,7 @@ class PupyOffloadAcceptor(object):
                     conninfo['rhost'], conninfo['rport']
                 ), (conninfo['rhost'], conninfo['rport'])
 
-            except (socket.error, OSError), e:
+            except (socks.GeneralProxyError, socket.error, OSError), e:
                 if e.errno in COMMON_EXCEPTIONS:
                     logger.error('Acceptor (%s): Lost connection (refused)', self._port)
                     time.sleep(5)
@@ -212,7 +212,7 @@ class PupyOffloadAcceptor(object):
                 continue
 
             except Exception, e:
-                logger.exception('Acceptor (%s): Exception: %s', e)
+                logger.exception('Acceptor (%s): Exception: %s', self._port, e)
                 raise
 
 class PupyOffloadManager(object):
@@ -307,7 +307,7 @@ class PupyOffloadManager(object):
 
         try:
             c = self._ctx.wrap_socket(c)
-        except (EOFError, ssl.SSLError, socket.error):
+        except (socks.GeneralProxyError, EOFError, ssl.SSLError, socket.error):
             raise EOFError('Failure during communication with offload server')
 
         m = MsgPackMessages(c)