diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceListener1_21.java b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceListener1_21.java
index 1b2ff9c6d..17c15291b 100644
--- a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceListener1_21.java
+++ b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceListener1_21.java
@@ -255,6 +255,9 @@ public void onAnimalFeeding(PlayerInteractEntityEvent event) {
     }
 
     private boolean isFeedingAnimal(CMIEntityType type, Material held) {
+        if (type == null) {
+            return false;
+        }
         switch (type) {
             case ARMADILLO: return isItemTag(held, "armadillo_food");
             case AXOLOTL: return isItemTag(held, "axolotl_food");
@@ -341,6 +344,9 @@ private static boolean isEquipFitAnimal(Entity entity, CMIMaterial held) {
             return false;
 
         CMIEntityType type = CMIEntityType.get(entity);
+        if (type == null)
+            return false;
+
         boolean isBodySlotAir = entInv.getItem(EquipmentSlot.BODY).getType() == Material.AIR;
 
         if (held.containsCriteria(CMIMC.CARPET))