diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index 973968f..aa4af80 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -225,7 +225,7 @@ function saveQueue() {
                         exists = exists || existing[i].uri.indexOf("m3u:") == 0 || existing[i].uri.indexOf("local:") == 0;
                     }
                     if (!exists || window.confirm("Overwrite existing playlist \"" + plname + "\"?")) {
-                        mopidy.playlists.create({'name': plname, 'uri_scheme': "local").then(function(playlist) {
+                        mopidy.playlists.create({'name': plname, 'uri_scheme': "local"}).then(function(playlist) {
                              playlist.tracks = tracks;
                              mopidy.playlists.save({'playlist': playlist}).then();
                              getPlaylists();
diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js
index c195e96..55bf24e 100644
--- a/mopidy_musicbox_webclient/static/js/gui.js
+++ b/mopidy_musicbox_webclient/static/js/gui.js
@@ -484,10 +484,10 @@ $(document).ready(function(event) {
     if (websocketUrl) {
         mopidy = new Mopidy({
             webSocketUrl: websocketUrl, // wslocation is set in index.html from the extention config.
-            callingConvention: "by-position-or-by-name"
+            callingConvention: 'by-position-or-by-name'
         });
     } else {
-        mopidy = new Mopidy({callingConvention: "by-position-or-by-name"});
+        mopidy = new Mopidy({callingConvention: 'by-position-or-by-name'});
     }
 //    mopidy.on(console.log.bind(console));  // Log all events
 //    mopidy.on(console.error.bind(console));
diff --git a/mopidy_musicbox_webclient/static/js/library.js b/mopidy_musicbox_webclient/static/js/library.js
index ca10756..78906c5 100644
--- a/mopidy_musicbox_webclient/static/js/library.js
+++ b/mopidy_musicbox_webclient/static/js/library.js
@@ -211,6 +211,9 @@ function getBrowseDir(rootdir) {
     } else {
         browseStack.push(rootdir);
     }
+    if (!rootdir) {
+        rootdir = null;
+    }
     mopidy.library.browse({'uri': rootdir}).then(processBrowseDir, console.error);
 }