diff --git a/bower.json b/bower.json
index 142d62f1..6b60a22a 100644
--- a/bower.json
+++ b/bower.json
@@ -9,7 +9,7 @@
     "angular-load": "~0.3.0",
     "angular-material": "^1.1.9",
     "angular-sanitize": "^1.7.0",
-    "angular-spinner": "~0.6.1",
+    "angular-spinner": "https://github.com/fablabbcn/bower-angular-spinner.git",
     "angular-ui-router": "^1.0.17",
     "angular-cookies": "^1.7.0",
     "d3": "~3.5.5",
diff --git a/src/app/core/api/device.service.js b/src/app/core/api/device.service.js
index 7ff05c75..8ea87f24 100644
--- a/src/app/core/api/device.service.js
+++ b/src/app/core/api/device.service.js
@@ -99,8 +99,11 @@
           timestamp: new Date(),
           data: data
         };
-
-        $window.localStorage.setItem('smartcitizen.markers', JSON.stringify(obj) );
+        try {
+          $window.localStorage.setItem('smartcitizen.markers', JSON.stringify(obj) );
+        } catch (e) {
+          console.log("Could not store markers in localstorage. skipping...");
+        }
         worldMarkers = obj.data;
       }