diff --git a/changelog.txt b/changelog.txt
index 54452a39..176c7552 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+------------------------------------------------------
+Version 2.0.0-11
+------------------------------------------------------
+- Fix NPE when checking if a player has a full Living Armor set
+
 ------------------------------------------------------
 Version 2.0.0-10
 ------------------------------------------------------
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
index e577d2b6..c8ca8965 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
@@ -8,6 +8,7 @@ import java.util.Map.Entry;
 import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
@@ -242,7 +243,8 @@ public class LivingArmour implements ILivingArmour
 
     public static boolean hasFullSet(EntityPlayer player) {
         for (int slot = 0; slot < player.inventory.armorInventory.length; slot++) {
-            if (!(player.inventory.armorItemInSlot(slot).getItem() instanceof ItemLivingArmour))
+            ItemStack slotStack = player.inventory.armorItemInSlot(slot);
+            if (slotStack != null && !(slotStack.getItem() instanceof ItemLivingArmour))
                 return false;
         }