diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 036bc9cf098..d91d8f66009 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -1522,7 +1522,8 @@ public final class EmacsService extends Service
 	    return entry;
 	  }
 
-	if (type.equals (Document.MIME_TYPE_DIR))
+	if (type != null
+	    && type.equals (Document.MIME_TYPE_DIR))
 	  entry.d_type = 1;
 	entry.d_name = name;
 	return entry;