diff --git a/src/main/scala/extracells/network/packet/part/PacketStorageSelectFluid.java b/src/main/scala/extracells/network/packet/part/PacketStorageSelectFluid.java
index ed057535..390c5625 100644
--- a/src/main/scala/extracells/network/packet/part/PacketStorageSelectFluid.java
+++ b/src/main/scala/extracells/network/packet/part/PacketStorageSelectFluid.java
@@ -35,7 +35,7 @@ public static class Handler implements IPacketHandlerServer {
 		@Override
 		public void onPacketData(PacketBufferEC data, EntityPlayerMP player) throws IOException {
 			Fluid fluid = data.readFluid();
-			ContainerStorage containerStorage = GuiUtil.getContainer(player, ContainerFluidStorage.class);
+			ContainerStorage containerStorage = GuiUtil.getContainer(player, ContainerStorage.class);
 			if (fluid == null || containerStorage == null) {
 				return;
 			}
diff --git a/src/main/scala/extracells/part/gas/PartGasTerminal.scala b/src/main/scala/extracells/part/gas/PartGasTerminal.scala
index 0fb35802..d6328df9 100644
--- a/src/main/scala/extracells/part/gas/PartGasTerminal.scala
+++ b/src/main/scala/extracells/part/gas/PartGasTerminal.scala
@@ -33,7 +33,7 @@ class PartGasTerminal extends PartFluidTerminal {
   @Optional.Method(modid = "MekanismAPI|gas")
   def doWorkGas {
     val secondSlot: ItemStack = this.inventory.getStackInSlot(1)
-    if (secondSlot != null && secondSlot.getCount >= secondSlot.getMaxStackSize) return
+    if (secondSlot != null && (!secondSlot.isEmpty) && secondSlot.getCount >= secondSlot.getMaxStackSize) return
     var container: ItemStack = this.inventory.getStackInSlot(0)
     if (container == null || container.isEmpty)
       doNextFill = false