diff --git a/README.rst b/README.rst
index 34fecff..0b92c38 100644
--- a/README.rst
+++ b/README.rst
@@ -7,6 +7,8 @@ Mopidy is a music server which can play music from `Spotify
 
 This is a responsive html/js/css client for Mopidy. Responsive, so it works on desktop and mobile browsers.
 
+Note: this is under heavy development!
+
 Installation
 
 To install Mopidy, check out
diff --git a/js/gui.js b/js/gui.js
index ff2eab8..706b674 100755
--- a/js/gui.js
+++ b/js/gui.js
@@ -314,12 +314,13 @@ function updateStatusOfAll() {
 
 function initSocketevents() {
     mopidy.on("state:online", function () {
+        $(window).hashchange();
         $("#offlinemodal").modal('hide');
         $("#loadingmodal").modal('show');
         getCurrentPlaylist();
         updateStatusOfAll();
         getPlaylists();
-        $(window).hashchange();
+        $("#loadingmodal").modal('show');
     });
 
     mopidy.on("state:offline", function () {
@@ -341,6 +342,7 @@ function initSocketevents() {
     });
 
     mopidy.on("event:playlistsLoaded", function (data) {
+        $("#loadingmodal").modal('show');
         getPlaylists();
     });
 
diff --git a/js/ws.js b/js/ws.js
index 6f14d43..b1d9d2c 100755
--- a/js/ws.js
+++ b/js/ws.js
@@ -74,6 +74,7 @@ function handleGetplaylists(resultArr) {
     /*<p><ul><li>Donec id elit non mi porta</li><li>Gravida at eget metus. Fusce dapibus.</li><li>Tellus ac cursus commodo</li></p>
      <p><a class="btn" href="#">More &raquo;</a></p>
      */
+    if (resultArr == '') { return; } 
     playlists = resultArr;
     tmp = '';
     for (var i = 0; i < playlists.length; i++) {