From a90f63f72ccc324daa687eb6d92b1bf843948cb2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 15 Jan 2016 18:49:12 +0000
Subject: [PATCH] null check

---
 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 d0bfdf77a8..b20f615a3f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -79,7 +79,7 @@ module.exports = React.createClass({
             hasUnsentMessages: this._hasUnsentMessages(room),
             callState: null,
             guestsCanJoin: false,
-            readMarkerEventId: room.getEventReadUpTo(MatrixClientPeg.get().credentials.userId),
+            readMarkerEventId: room ? room.getEventReadUpTo(MatrixClientPeg.get().credentials.userId) : null,
             readMarkerGhostEventId: undefined
         }
     },