1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
index 6cd7f9e8e3..7e4e105353 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java
@@ -186,8 +186,8 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank {
 
     @Override
     public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
-        if (mTileEntity.getMetaTileEntity() == null) return null;
         GT_MetaTileEntity_BasicMachine machine = (GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity();
+        if (machine == null) return null;
         switch (aSlotIndex) {
             case 0:
                 machine.mFluidTransfer = !machine.mFluidTransfer;
@@ -216,7 +216,7 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank {
                             // both nonnull. actually both pickup and fill is reasonable, but I'll go with fill here
                             return fillFluid(machine, aPlayer, tFluidHeld);
                         } else {
-                            return pickupFluid(machine.getFillableStack(), aPlayer);
+                            return pickupFluid(tInputFluid, aPlayer);
                         }
                     }
                 } else {