From d5d66e969e9321942f3bd6666d604acc30b36c3b Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 29 Sep 2017 14:02:34 -0400
Subject: [PATCH] FIX: js error when logging in using another Discourse site as
 sso provider

---
 app/assets/javascripts/discourse/controllers/login.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index a42f4233c42..c524939435b 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -71,7 +71,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
         type: 'POST'
       }).then(function (result) {
         // Successful login
-        if (result.error) {
+        if (result && result.error) {
           self.set('loggingIn', false);
           if (result.reason === 'not_activated') {
             self.send('showNotActivated', {