From 51a5542446fab47ecb4411ae380708362d7406f8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 23 Sep 2016 18:20:31 +0100
Subject: [PATCH] Make tests pass

---
 src/components/structures/RoomDirectory.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index cb77087fb..152624dd9 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -99,6 +99,8 @@ module.exports = React.createClass({
     },
 
     getMoreRooms: function() {
+        if (!MatrixClientPeg.get()) return q();
+
         const my_filter_string = this.filterString;
         const opts = {limit: 20};
         if (this.nextBatch) opts.since = this.nextBatch;