Merge remote-tracking branch 'origin/develop' into develop

2017-11-01 22:18:10 +00:00
parent e68ab44596 815b42f0ac
commit 7ff50d01b8
1 changed files with 5 additions and 1 deletions
@@ -129,7 +129,11 @@ class FlairStore extends EventEmitter {
        }
        const updatedUserGroups = resp.users;
        usersInFlight.forEach((userId) => {
-            this._usersPending[userId].resolve(updatedUserGroups[userId] || []);
+            if (this._usersPending[userId]) {
                this._usersPending[userId].resolve(updatedUserGroups[userId] || []);
            } else {
                console.error("Promise vanished for resolving groups for " + userId);
            }
        });
    }