diff --git a/src/apps/storetool/bongo/storetool/BackupCommands.py b/src/apps/storetool/bongo/storetool/BackupCommands.py
index 3d62679..f281371 100644
--- a/src/apps/storetool/bongo/storetool/BackupCommands.py
+++ b/src/apps/storetool/bongo/storetool/BackupCommands.py
@@ -118,7 +118,7 @@ class StoreBackupCommand(Command):
                 props = docstore.PropGet(document.uid)
                 for key in props.keys():
                     headerx.SetKey("BONGO.%s" % key, props[key])
-                backup_file.write(headerx.ToString())
+                backup_file.write(headerx.ToString().encode("utf-8"))
 
                 # tar files have a 512 byte header (tar_info.tobuf()), and then the content
                 # content is padded to a multiple of 512 bytes
diff --git a/src/libs/python/bongo/store/CommandStream.py b/src/libs/python/bongo/store/CommandStream.py
index cae6dba..5d86edd 100644
--- a/src/libs/python/bongo/store/CommandStream.py
+++ b/src/libs/python/bongo/store/CommandStream.py
@@ -43,7 +43,10 @@ class Collection:
         ret = re.split(r"(?<!\\) ", response.message)
         ret = [re.sub(r"\\ ", " ", x) for x in ret]
 
-        self.uid, self.type, self.flags, self.name = ret
+        if len(ret) < 4:
+             return null
+        self.uid, self.type, self.flags = ret[0:3]
+        self.name = " ".join(ret[3:])
 
         self.flags = int(self.flags)
         self.type = int(self.type)
diff --git a/src/libs/python/bongo/store/StoreClient.py b/src/libs/python/bongo/store/StoreClient.py
index 4574ff7..152199e 100644
--- a/src/libs/python/bongo/store/StoreClient.py
+++ b/src/libs/python/bongo/store/StoreClient.py
@@ -596,6 +596,7 @@ class StoreClient:
             raise CommandError(r)
 
     def List(self, path, props=[], start=-1, end=-1, flags=None, mask=None):
+        path = path.replace(" ", "\ ")
         command = "LIST %s" % path
 
         if start == -1 and end == -1:
@@ -719,6 +720,7 @@ class StoreClient:
         self.connection.Close()
 
     def Read(self, doc):
+        doc = doc.replace(" ", "\ ")
         self.stream.Write("READ %s" % (doc))
         r = self.stream.GetResponse()
         if r.code != 2001: