diff --git a/VERSION b/VERSION
index cef0ace1..24da21d6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-27 16:53:32) dev
+Version 2.00.0 (2012-06-27 17:45:06) dev
diff --git a/gluon/rocket.py b/gluon/rocket.py
index 3a1cf52b..335362f6 100644
--- a/gluon/rocket.py
+++ b/gluon/rocket.py
@@ -1374,6 +1374,8 @@ class Worker(Thread):
                     d = d.decode('ISO-8859-1')
         except socket.timeout:
             raise SocketTimeout("Socket timed out before request.")
+        except TypeError:
+            raise SocketTimeout("Socket timed out before request.")
 
         d = d.strip()