diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
index 9a2c457d..93b9a135 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
@@ -250,9 +250,11 @@ public class GenericHandler {
                         targetTaskMap.remove(animal);
                         attackTaskMap.remove(animal);
                     }
-                } else if (targetTaskMap.containsKey(animal)) {
-                    targetTaskMap.remove(animal);
-                    attackTaskMap.remove(animal);
+                } else {
+                    if (targetTaskMap != null)
+                        targetTaskMap.remove(animal);
+                    if (attackTaskMap != null)
+                        attackTaskMap.remove(animal);
                 }
             }
         }