diff --git a/src/main/java/cpw/mods/ironchest/common/lib/ICChestInventoryHandler.java b/src/main/java/cpw/mods/ironchest/common/lib/ICChestInventoryHandler.java
index f963120..0fc8ef7 100644
--- a/src/main/java/cpw/mods/ironchest/common/lib/ICChestInventoryHandler.java
+++ b/src/main/java/cpw/mods/ironchest/common/lib/ICChestInventoryHandler.java
@@ -79,10 +79,11 @@ public class ICChestInventoryHandler implements IItemHandlerModifiable
         }
         else
         {
-            if (!ItemHandlerHelper.canItemStacksStack(stack, currentStack))
+            int accepted = Math.min(stack.getMaxStackSize(), inv.getInventoryStackLimit()) - currentStack.getCount();
+
+            if (accepted <= 0 || !ItemHandlerHelper.canItemStacksStack(stack, currentStack))
                 return stack;
 
-            int accepted = Math.min(stack.getMaxStackSize(), inv.getInventoryStackLimit()) - currentStack.getCount();
             if (accepted < stack.getCount())
             {
                 if (!simulate)
diff --git a/src/main/java/cpw/mods/ironchest/common/lib/ICShulkerInventoryHandler.java b/src/main/java/cpw/mods/ironchest/common/lib/ICShulkerInventoryHandler.java
index 0233e97..d402596 100644
--- a/src/main/java/cpw/mods/ironchest/common/lib/ICShulkerInventoryHandler.java
+++ b/src/main/java/cpw/mods/ironchest/common/lib/ICShulkerInventoryHandler.java
@@ -79,10 +79,11 @@ public class ICShulkerInventoryHandler implements IItemHandlerModifiable
         }
         else
         {
-            if (!ItemHandlerHelper.canItemStacksStack(stack, currentStack))
+            int accepted = Math.min(stack.getMaxStackSize(), inv.getInventoryStackLimit()) - currentStack.getCount();
+
+            if (accepted <= 0 || !ItemHandlerHelper.canItemStacksStack(stack, currentStack))
                 return stack;
 
-            int accepted = Math.min(stack.getMaxStackSize(), inv.getInventoryStackLimit()) - currentStack.getCount();
             if (accepted < stack.getCount())
             {
                 if (!simulate)