diff --git a/ennstatus/api/views.py b/ennstatus/api/views.py
--- a/ennstatus/api/views.py
+++ b/ennstatus/api/views.py
@@ -5,6 +5,8 @@ from datetime import datetime
 from flask import (Blueprint, request, current_app, jsonify, render_template,
                    abort)
 
+from werkzeug.exceptions import BadRequest
+
 import strict_rfc3339
 import pygeoip
 
@@ -44,9 +46,9 @@ def update():
         current_app.logger.error(str(e))
         return abort(500)
 
-    data = request.get_json()
-
-    if data is None:
+    try:
+        data = request.get_json()
+    except BadRequest:
         current_app.logger.info('No JSON data supplied!')
         return 'No JSON data supplied!\n', 400, {'Content-Type': 'text/plain'}