diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py
index 2fa025bfc7..6446c3c6c3 100644
--- a/synapse/handlers/e2e_room_keys.py
+++ b/synapse/handlers/e2e_room_keys.py
@@ -110,7 +110,8 @@ class E2eRoomKeysHandler(object):
         # XXX: perhaps we should use a finer grained lock here?
         with (yield self._upload_linearizer.queue(user_id)):
             # Check that the version we're trying to upload is the current version
-            version_info = yield self.get_current_version_info(user_id)
+            try:
+                version_info = yield self.get_current_version_info(user_id)
             except StoreError as e:
                 if e.code == 404:
                     raise SynapseError(404, "Version '%s' not found" % (version,))
diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index e04e6a3690..b51faa1204 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -219,7 +219,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
             )
 
         return self.runInteraction(
-            desc="get_e2e_room_keys_version_info",
+            "get_e2e_room_keys_version_info",
             _get_e2e_room_keys_version_info_txn
         )