From 77fb2b72aeccfa94a47b9088c885ed103edbfc60 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 12 Apr 2017 09:47:29 +0100
Subject: [PATCH] Handle no previous RM

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

diff --git a/synapse/handlers/read_marker.py b/synapse/handlers/read_marker.py
index ee8cfc1c7a..43489b88bf 100644
--- a/synapse/handlers/read_marker.py
+++ b/synapse/handlers/read_marker.py
@@ -43,7 +43,10 @@ class ReadMarkerHandler(BaseHandler):
         # Get ordering for existing read marker
         with (yield self.read_marker_linearizer.queue((room_id, user_id))):
             account_data = yield self.store.get_account_data_for_room(user_id, room_id)
-            existing_read_marker = account_data["m.read_marker"]
+
+            existing_read_marker = None
+            if "m.read_marker" in account_data:
+                existing_read_marker = account_data["m.read_marker"]
 
             should_update = True