diff --git a/core/src/main/java/io/undertow/server/handlers/resource/PathResource.java b/core/src/main/java/io/undertow/server/handlers/resource/PathResource.java
index 3aed12ade4..7a28a4aff1 100644
--- a/core/src/main/java/io/undertow/server/handlers/resource/PathResource.java
+++ b/core/src/main/java/io/undertow/server/handlers/resource/PathResource.java
@@ -78,7 +78,10 @@ public ETag getETag() {
 
     @Override
     public String getName() {
-        return file.getFileName().toString();
+        if( file.getFileName() != null ) {
+            return file.getFileName().toString();
+        }
+        return file.toString();
     }
 
     @Override