From fec2e31b41eb66feab0cabacf1d20fb482e92a45 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 5 Dec 2017 11:38:25 +0000
Subject: [PATCH] oops, actual null check

---
 src/Lifecycle.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 4f786510e1..b35957408e 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -389,7 +389,9 @@ function _persistCredentialsToLocalStorage(credentials) {
  * Logs the current session out and transitions to the logged-out state
  */
 export function logout() {
-    if (MatrixClientPeg.get() && MatrixClientPeg.get().isGuest()) {
+    if (!MatrixClientPeg.get()) return
+
+    if (MatrixClientPeg.get().isGuest()) {
         // logout doesn't work for guest sessions
         // Also we sometimes want to re-log in a guest session
         // if we abort the login