From 7244d30c9c6f0437e9d0ddd8b08029a91164f685 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 24 Oct 2018 16:44:18 +0200
Subject: [PATCH] guard against empty roomId/non-existant room

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

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index b5fe0cfbc1..5478a725ff 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -424,7 +424,7 @@ module.exports = React.createClass({
         const cli = MatrixClientPeg.get();
         const room = cli.getRoom(this.props.roomId);
         let inviteButton;
-        if (room.getMyMembership() === 'join') {
+        if (room && room.getMyMembership() === 'join') {
             const TintableSvg = sdk.getComponent("elements.TintableSvg");
             const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
             inviteButton =