diff --git a/lib/pushprocessor.js b/lib/pushprocessor.js
index 10533b148..f988f9a4b 100644
--- a/lib/pushprocessor.js
+++ b/lib/pushprocessor.js
@@ -136,6 +136,8 @@ module.exports = function(client) {
         }
 
         var room = client.getRoom(ev.room_id);
+        if (!room || !room.currentState || !room.currentState.members) { return false; }
+
         var displayName = room.currentState.getMember(client.credentials.userId).name;
 
         var pat = new RegExp("\\b" + escapeRegExp(displayName) + "\\b", 'i');