diff --git a/lib/http.py b/lib/http.py
index 50012eb4afb99b4d72cb3dd563af3320783bce8d..4defe5ed0bedf5ac572c1a9e97e1d08d54957e77 100644
--- a/lib/http.py
+++ b/lib/http.py
@@ -551,7 +551,10 @@ class _HttpConnectionHandler(object):
     data = self.rfile.read(content_length)
 
     # TODO: Content-type, error handling
-    self.request_post_data = HTTPJsonConverter().Decode(data)
+    if data:
+      self.request_post_data = HTTPJsonConverter().Decode(data)
+    else:
+      self.request_post_data = None
 
     logging.debug("HTTP POST data: %s", self.request_post_data)