diff --git a/common/net/minecraftforge/liquids/LiquidContainerRegistry.java b/common/net/minecraftforge/liquids/LiquidContainerRegistry.java
index b2796cb62c..f46c38ede9 100644
--- a/common/net/minecraftforge/liquids/LiquidContainerRegistry.java
+++ b/common/net/minecraftforge/liquids/LiquidContainerRegistry.java
@@ -62,7 +62,7 @@ public class LiquidContainerRegistry {
     public static ItemStack fillLiquidContainer(LiquidStack liquid, ItemStack emptyContainer) {
 
         if (emptyContainer == null || liquid == null) {
-            return emptyContainer;
+            return null;
         }
         LiquidContainerData ret = mapFilledItemFromLiquid.get(Arrays.asList(emptyContainer.itemID, emptyContainer.getItemDamage(), liquid.itemID, liquid.itemMeta));
         if (ret != null) {