diff --git a/ctl b/ctl
index 805595c..1abac88 100755
--- a/ctl
+++ b/ctl
@@ -187,7 +187,7 @@ fi
 
 if [ "$1" == "ui" ]; then
     shift
-    $PYTHON "$NAME/oml/ui.py" $@
+    $PYTHON "$NAME/oml/ui.py" "$@"
     exit $?
 fi
 if [ "$1" == "init" ]; then
diff --git a/oml/ui.py b/oml/ui.py
index ba4630a..5b9dc26 100644
--- a/oml/ui.py
+++ b/oml/ui.py
@@ -104,7 +104,8 @@ if __name__ == '__main__':
     if len(sys.argv) >= 3:
         base = sys.argv[2]
     base = os.path.expanduser(base)
-    os.chdir(base)
+    if os.path.exists(base):
+        os.chdir(base)
     if len(sys.argv) >= 2 and sys.argv[1] == 'folder':
         print(ui.selectFolder({}))
     else: