diff --git a/libmproxy/encoding.py b/libmproxy/encoding.py
index 9f8acbe98..4b80d38cf 100644
--- a/libmproxy/encoding.py
+++ b/libmproxy/encoding.py
@@ -54,7 +54,7 @@ def decode_gzip(content):
     gfile = gzip.GzipFile(fileobj=cStringIO.StringIO(content))
     try:
         return gfile.read()
-    except IOError:
+    except (IOError, EOFError):
         return None
 
 def encode_gzip(content):