diff -r 1751d96d324f -r 7292a4618f46 tests/tinyproxy.py
--- a/tests/tinyproxy.py	Sun May 13 13:17:27 2012 +0200
+++ b/tests/tinyproxy.py	Sun May 13 13:17:31 2012 +0200
@@ -47,7 +47,7 @@
         try: soc.connect(host_port)
         except socket.error, arg:
             try: msg = arg[1]
-            except: msg = arg
+            except (IndexError, TypeError): msg = arg
             self.send_error(404, msg)
             return 0
         return 1