diff --git a/src/main/java/org/dynmap/web/handlers/FilesystemHandler.java b/src/main/java/org/dynmap/web/handlers/FilesystemHandler.java
index d20b217c..ec22ad3a 100644
--- a/src/main/java/org/dynmap/web/handlers/FilesystemHandler.java
+++ b/src/main/java/org/dynmap/web/handlers/FilesystemHandler.java
@@ -27,6 +27,7 @@ public class FilesystemHandler extends FileHandler {
     }
     @Override
     protected InputStream getFileInput(String path, HttpRequest request, HttpResponse response) {
+    	if(path == null) return null;
     	path = getNormalizedPath(path);	/* Resolve out relative stuff - nothing allowed above webroot */
         File file = new File(root, path);
         if(!file.isFile())