From 0a79b0f9e28002d3925be7b982f10e76a99b6c0b Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 18 Jan 2016 19:56:47 +0000
Subject: [PATCH] fix NPE from kegan's memberlist branch

---
 src/components/views/rooms/MemberList.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index ff76e64c56..abcd3f83da 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -319,6 +319,8 @@ module.exports = React.createClass({
         } else {
             // TODO: Cache this calculation
             var room = MatrixClientPeg.get().getRoom(this.props.roomId);
+            if (!room) return <div></div>;
+
             var allUsers = MatrixClientPeg.get().getUsers();
             // only add Users if they are not joined
             allUsers = allUsers.filter(function(u) {