diff --git a/entity/src/ent/anno/proc/EntityProcessor.java b/entity/src/ent/anno/proc/EntityProcessor.java
index 48e4c64..c322836 100644
--- a/entity/src/ent/anno/proc/EntityProcessor.java
+++ b/entity/src/ent/anno/proc/EntityProcessor.java
@@ -831,7 +831,7 @@ protected void process() throws IOException{
                             .addParameter(paramSpec(spec(Class.class), tvSpec("E")), "type")
                             .addParameter(paramSpec(spec(Func.class), spec(String.class), subSpec(tvSpec("T"))), "create")
                             .beginControlFlow("if(type.getName().startsWith($S))", "mindustry.gen.")
-                                .addStatement("var prov = $T.find($T.idMap, p -> p.get().getClass().equals(type))", spec(Structs.class), spec(EntityMapping.class))
+                                .addStatement("var prov = $T.find($T.idMap, p -> p != null && p.get().getClass().equals(type))", spec(Structs.class), spec(EntityMapping.class))
                                 .addStatement("$T.nameMap.put($S + name, prov)", spec(EntityMapping.class), modName + "-")
                             .nextControlFlow("else")
                                 .addStatement("$T.nameMap.put($S + name, get(type))", spec(EntityMapping.class), modName + "-")