From 5330e47b3fd91df7833f1cc22bd96c7cea4d0130 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 15 Mar 2017 13:05:03 +0000
Subject: [PATCH] Add null check

---
 src/components/structures/MatrixChat.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 48e7f40dca..2337d62fd8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -700,7 +700,8 @@ module.exports = React.createClass({
         // Show screens (like 'register') that need to be shown without onLoggedIn
         // being called. 'register' needs to be routed here when the email confirmation
         // link is clicked on.
-        if (['register'].indexOf(this.state.screenAfterLogin.screen) !== -1) {
+        if (this.state.screenAfterLogin &&
+            ['register'].indexOf(this.state.screenAfterLogin.screen) !== -1) {
             this._showScreenAfterLogin();
         }
     },