Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_…

…member_event
matrix-org · Feb 26, 2016 · 413e36b · 413e36b
2 parents 354d384 + 9329cd5
commit 413e36b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
@@ -404,10 +404,12 @@ def _parse_json(request):
     try:
         content = json.loads(request.content.read())
         if type(content) != dict:
-            raise SynapseError(400, "Content must be a JSON object.")
+            raise SynapseError(
+                400, "Content must be a JSON object.", errcode=Codes.BAD_JSON
+            )
         return content
     except ValueError:
-        raise SynapseError(400, "Content not JSON.")
+        raise SynapseError(400, "Content not JSON.", errcode=Codes.NOT_JSON)
 
 
 def register_servlets(hs, http_server):