From 63658e0441e9be4ad1b26797e9621cc921041768 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 13 Dec 2018 14:29:12 -0700
Subject: [PATCH] Add a missing null check

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

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 91c5d0321d..676edc1ea2 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -257,7 +257,7 @@ module.exports = React.createClass({
         if (!isInvite && isJoined && looksLikeDm) {
             const selfId = MatrixClientPeg.get().getUserId();
             const otherMember = this.props.room.currentState.getMembersExcept([selfId])[0];
-            if (otherMember.user && otherMember.user._unstable_statusMessage) {
+            if (otherMember && otherMember.user && otherMember.user._unstable_statusMessage) {
                 subtext = otherMember.user._unstable_statusMessage;
             }
         }