From c903cc63756d83a087f00a6709fa843868804874 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Mar 2018 14:55:36 +0000
Subject: [PATCH] Fix tests

---
 src/components/views/avatars/RoomAvatar.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 0ccf9c66fe..e547cf0fa7 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -53,7 +53,10 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
-        MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
+        const cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener("RoomState.events", this.onRoomStateEvents);
+        }
     },
 
     componentWillReceiveProps: function(newProps) {