diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java
index 12b7ebf2..34c2cfa9 100644
--- a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java
@@ -135,8 +135,8 @@ public class PlayerDemonWillHandler
      */
     public static ItemStack addDemonWill(EntityPlayer player, ItemStack willStack)
     {
-        if (willStack == null)
-            return null;
+        if (willStack.isEmpty())
+            return ItemStack.EMPTY;
 
         NonNullList<ItemStack> inventory = player.inventory.mainInventory;
 
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java
index 95c79bff..9dd3d359 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java
@@ -109,7 +109,7 @@ public class WillHandler
                     {
                         remainder = PlayerDemonWillHandler.addDemonWill(player, willStack);
 
-                        if (remainder != null)
+                        if (!remainder.isEmpty())
                         {
                             EnumDemonWillType pickupType = ((IDemonWill) remainder.getItem()).getType(remainder);
                             if (((IDemonWill) remainder.getItem()).getWill(pickupType, remainder) >= 0.0001)