diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 330b1271..0655e33f 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1385,7 +1385,8 @@ def FDroidPopen(commands, cwd=None, output=True):
     :returns: A PopenResult.
     """
 
-    cwd = os.path.normpath(cwd)
+    if cwd:
+        cwd = os.path.normpath(cwd)
 
     if output:
         if cwd: