3 files changed, 16 insertions, 8 deletions
diff --git a/web/react/stores/browser_store.jsx b/web/react/stores/browser_store.jsx
index d2dedb271..27a74fb2b 100644
--- a/web/react/stores/browser_store.jsx
+++ b/web/react/stores/browser_store.jsx
@@ -4,7 +4,7 @@
 var UserStore;
 function getPrefix() {
     if (!UserStore) {
-        UserStore = require('./user_store.jsx');
+        UserStore = require('./user_store.jsx'); //eslint-disable-line global-require
     }
     return UserStore.getCurrentId() + '_';
 }
@@ -41,7 +41,13 @@ class BrowserStoreClass {
     }
 
     setGlobalItem(name, value) {
-        localStorage.setItem(name, JSON.stringify(value));
+        try {
+            localStorage.setItem(name, JSON.stringify(value));
+        } catch (err) {
+            console.log('An error occurred while setting local storage, clearing all props'); //eslint-disable-line no-console
+            localStorage.clear();
+            window.location.href = window.location.href;
+        }
     }
 
     getGlobalItem(name, defaultValue) {
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 1d853f979..9f354965e 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -50,8 +50,10 @@ class SocketStoreClass extends EventEmitter {
                 }
 
                 this.failCount = 0;
-                ErrorStore.storeLastError(null);
-                ErrorStore.emitChange();
+                if (ErrorStore.getLastError()) {
+                    ErrorStore.storeLastError(null);
+                    ErrorStore.emitChange();
+                }
             };
 
             conn.onclose = () => {
diff --git a/web/react/stores/team_store.jsx b/web/react/stores/team_store.jsx
index 1f33fe03b..fd9117747 100644
--- a/web/react/stores/team_store.jsx
+++ b/web/react/stores/team_store.jsx
@@ -10,12 +10,12 @@ var BrowserStore = require('../stores/browser_store.jsx');
 
 var CHANGE_EVENT = 'change';
 
-var utils;
+var Utils;
 function getWindowLocationOrigin() {
-    if (!utils) {
-        utils = require('../utils/utils.jsx');
+    if (!Utils) {
+        Utils = require('../utils/utils.jsx'); //eslint-disable-line global-require
     }
-    return utils.getWindowLocationOrigin();
+    return Utils.getWindowLocationOrigin();
 }
 
 class TeamStoreClass extends EventEmitter {