1 files changed, 11 insertions, 2 deletions

diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index d6a2e5fde..ec0b0cf8d 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -348,7 +348,12 @@ export default class UserStore extends Store {
   // Reactions
   async _getUserData() {
     if (this.isLoggedIn) {
-      const data = await this.getUserInfoRequest.execute()._promise;
+      let data;
+      try {
+        data = await this.getUserInfoRequest.execute()._promise;
+      } catch (e) {
+        return false;
+      }
 
       // We need to set the beta flag for the SettingsStore
       this.actions.settings.update({
@@ -408,7 +413,11 @@ export default class UserStore extends Store {
   }
 
   async _migrateUserLocale() {
-    await this.getUserInfoRequest._promise;
+    try {
+      await this.getUserInfoRequest._promise;
+    } catch (e) {
+      return false;
+    }
 
     if (!this.data.locale) {
       debug('Migrate "locale" to user data');