diff --git a/lib/takeover/web.py b/lib/takeover/web.py
index b6bf9ff41..601351296 100644
--- a/lib/takeover/web.py
+++ b/lib/takeover/web.py
@@ -213,6 +213,9 @@ class Web:
             if success:
                 break
 
+            if not directory:
+                continue
+
             uploaded = False
             directory = ntToPosixSlashes(normalizePath(directory))
 
diff --git a/thirdparty/multipart/multipartpost.py b/thirdparty/multipart/multipartpost.py
index 2863b8580..e9aa1a85e 100644
--- a/thirdparty/multipart/multipartpost.py
+++ b/thirdparty/multipart/multipartpost.py
@@ -81,9 +81,10 @@ class MultipartPostHandler(urllib2.BaseHandler):
             buf = ''
 
         for (key, value) in vars:
-            buf += '--%s\r\n' % boundary
-            buf += 'Content-Disposition: form-data; name="%s"' % key
-            buf += '\r\n\r\n' + value + '\r\n'
+            if key is not None and value is not None:
+                buf += '--%s\r\n' % boundary
+                buf += 'Content-Disposition: form-data; name="%s"' % key
+                buf += '\r\n\r\n' + value + '\r\n'
 
         for (key, fd) in files:
             file_size = os.fstat(fd.fileno())[stat.ST_SIZE] if isinstance(fd, file) else fd.len