--- a/python/daemon.py	Sun Jan 20 00:12:17 2008 +0100
+++ b/python/daemon.py	Sun Jan 20 00:22:09 2008 +0100
@@ -28,8 +28,9 @@
 def encode_int(i):
     return chr((i/256)%256) + chr(i%256)
 
-def encode_str(str):
-    return encode_int(len(str)) + str
+def encode_str(s):
+    s = str(s)
+    return encode_int(len(s)) + s
 
 class Command:
     def __init__(self, name, args):
@@ -59,7 +60,10 @@
             reply = self.socket.recv(3)
             code = ord(reply[0])
             msglen = ord(reply[1])*256 + ord(reply[2])
-            message = self.socket.recv(msglen)
+            if msglen:
+                message = self.socket.recv(msglen)
+            else:
+                message = ""
         except:
             return (econn, 'Server aborted the connection')
         return (code, message)