diff --git a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/entitytick/EntityTickManager.java b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/entitytick/EntityTickManager.java
index dae447a..c98da86 100644
--- a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/entitytick/EntityTickManager.java
+++ b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/entitytick/EntityTickManager.java
@@ -66,7 +66,11 @@ public class EntityTickManager  extends TimerTask {
 				}
 				ewc.getToUntick().clear();
 				for(int i : ewc.getToTick().keySet()) {
-					ws.entitiesById.put(i, ewc.getToTick().get(i));
+					net.minecraft.server.v1_14_R1.Entity entity = ewc.getToTick().get(i);
+					if(entity == null) {
+						continue;
+					}
+					ws.entitiesById.put(i, entity);
 				}
 				ewc.getToTick().clear();
 			} catch (IllegalArgumentException | IllegalAccessException e) {