From a28aab42c46e69c640bf375a05d388fa53758372 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 16 Sep 2016 16:45:35 +0100
Subject: [PATCH] fix NPE in guest access

---
 src/components/structures/RoomView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 947ff7cb4e..91d1918c0f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -678,7 +678,7 @@ module.exports = React.createClass({
             // if this is an invite and has the 'direct' hint set, mark it as a DM room now.
             if (this.state.room) {
                 const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
-                if (me.membership == 'invite') {
+                if (me && me.membership == 'invite') {
                     // The 'direct' hihnt is there, so declare that this is a DM room for
                     // whoever invited us.
                     if (me.events.member.getContent().is_direct) {