From 4e05aab4f7daa79d3a521f3477f6ade10157350b Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 22 Oct 2015 17:08:59 +0100
Subject: [PATCH] Don't assume that the event has a room_id or sender

---
 synapse/api/filtering.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index 522b151c35..765d1bc9d5 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -191,8 +191,8 @@ class Filter(object):
             )
         else:
             return self.check_fields(
-                event.room_id,
-                event.sender,
+                getattr(event, "room_id", None),
+                getattr(event, "sender", None),
                 event.type,
             )