diff --git a/changelog.txt b/changelog.txt
index d2e6cb5e..009e4c07 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+------------------------------------------------------
+Version 2.1.0-65
+------------------------------------------------------
+- Fixed NPE when attacking mobs when you don't have a set of Living Armour. Oops.
+
 ------------------------------------------------------
 Version 2.1.0-64
 ------------------------------------------------------
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 cda0b7ee..d5b906fe 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
@@ -155,10 +155,19 @@ public class GenericHandler
                     ItemHelper.LPContainer.addLPToItem(player.getItemStackFromSlot(EntityEquipmentSlot.CHEST), totalLP, pack.CAPACITY);
             }
 
-            LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.battleHunger", player.getItemStackFromSlot(EntityEquipmentSlot.CHEST));
-            if (upgrade instanceof LivingArmourUpgradeBattleHungry)
+            if (LivingArmour.hasFullSet(player))
             {
-                ((LivingArmourUpgradeBattleHungry) upgrade).resetTimer();
+                ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
+                LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack);
+                if (armour != null)
+                {
+
+                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.battleHunger", chestStack);
+                    if (upgrade instanceof LivingArmourUpgradeBattleHungry)
+                    {
+                        ((LivingArmourUpgradeBattleHungry) upgrade).resetTimer();
+                    }
+                }
             }
         }
     }