More bug fixes

2 files changed, 7 insertions, 3 deletions

diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index 0bff644192..871564a3a2 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -70,7 +70,11 @@ class BaseHandler(object):
             builder.room_id,
         )
 
-        depth = max([d for _, _, d in latest_ret])
+        if latest_ret:
+            depth = max([d for _, _, d in latest_ret])
+        else:
+            depth = 1
+
         prev_events = [(e, h) for e, h, _ in latest_ret]
 
         builder.prev_events = prev_events
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index f0ffd62b7f..ffcdbcfdf7 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -173,13 +173,14 @@ class RoomCreationHandler(BaseHandler):
             "sender": creator_id,
         }
 
-        def create(etype, content):
+        def create(etype, content, **kwargs):
             e = {
                 "type": etype,
                 "content": content,
             }
 
             e.update(event_keys)
+            e.update(kwargs)
 
             return e
 
@@ -194,7 +195,6 @@ class RoomCreationHandler(BaseHandler):
             content={
                 "membership": Membership.JOIN,
             },
-            **event_keys
         )
 
         power_levels_event = create(