diff --git a/cgi.d b/cgi.d
index ba83453..9bd2697 100644
--- a/cgi.d
+++ b/cgi.d
@@ -7080,8 +7080,10 @@ version(cgi_with_websocket) {
 				return false;
 			if(!isDataPending())
 				return true;
-			while(isDataPending())
-				lowLevelReceive();
+			while(isDataPending()) {
+				if(lowLevelReceive() == false)
+					throw new ConnectionClosedException("Connection closed in middle of message");
+			}
 			goto checkAgain;
 		}