diff --git a/trunk/contrib/tor_resolve b/trunk/contrib/tor_resolve
index 8242916df4..31b44af9d4 100755
--- a/trunk/contrib/tor_resolve
+++ b/trunk/contrib/tor_resolve
@@ -97,7 +97,11 @@ def resolve(hostname, sockshost, socksport, socksver=4):
     answer = s.recv(8)
     result = parse(answer)
     while result is None:
-        answer += s.recv(1)
+        more = s.recv(1)
+        if not more:
+            print "Connection closed; dying."
+            return None
+        answer += more
         result = parse(answer)
     print "Got answer",result
     m = s.recv(1)