diff --git a/src/main/java/org/dynmap/web/HttpServerConnection.java b/src/main/java/org/dynmap/web/HttpServerConnection.java
index 7e7647cb..5fefc144 100644
--- a/src/main/java/org/dynmap/web/HttpServerConnection.java
+++ b/src/main/java/org/dynmap/web/HttpServerConnection.java
@@ -29,7 +29,10 @@ public class HttpServerConnection extends Thread {
 
     private static boolean readRequestHeader(InputStream in, HttpRequest request) throws IOException {
         BufferedReader r = new BufferedReader(new InputStreamReader(in));
-        Matcher m = requestHeaderLine.matcher(r.readLine());
+        String statusLine = r.readLine();
+        if (statusLine == null)
+            return false;
+        Matcher m = requestHeaderLine.matcher(statusLine);
         if (!m.matches())
             return false;
         request.method = m.group(1);