From db61d8e8ad9693ea613aec84d6f87f40ebef9871 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 9 Sep 2016 02:28:14 +0100
Subject: [PATCH] another null check

---
 src/components/views/rooms/RoomList.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 4a4f0dce2f..fd3f491ad9 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -148,6 +148,7 @@ module.exports = React.createClass({
 
     onRoomTimeline: function(ev, room, toStartOfTimeline, removed, data) {
         if (toStartOfTimeline) return;
+        if (!room) return;
         if (data.timeline.getTimelineSet() !== room.getUnfilteredTimelineSet()) return;
         this._delayedRefreshRoomList();
     },