From 8888982db3dbf839003fb544072348f73609724f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 13 May 2015 15:43:32 +0100
Subject: [PATCH] Don't insert None

---
 synapse/storage/_base.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index f990b8149e..bb80108a30 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -1002,7 +1002,10 @@ class SQLBaseStore(object):
                     e.event_id, check_redacted, get_prev_content, e
                 )
 
-        return [event_map[e_id] for e_id in events if e_id in event_map]
+        return [
+            event_map[e_id] for e_id in events
+            if e_id in event_map and event_id[e_id]
+        ]
 
     def _get_event_from_row_txn(self, txn, internal_metadata, js, redacted,
                                 check_redacted=True, get_prev_content=False,