diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java
index 8e30fecfd..30f1d4df5 100644
--- a/src/main/java/mekanism/common/block/BlockMachine.java
+++ b/src/main/java/mekanism/common/block/BlockMachine.java
@@ -529,10 +529,12 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
 	
 							for(Fluid f : FluidRegistry.getRegisteredFluids().values())
 							{
-								ItemStack filled = new ItemStack(item, 1, type.meta);
-								itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled);
-								itemMachine.setPrevScale(filled, 1);
-								list.add(filled);
+								try { //Prevent bad IDs
+									ItemStack filled = new ItemStack(item, 1, type.meta);
+									itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled);
+									itemMachine.setPrevScale(filled, 1);
+									list.add(filled);
+								} catch(Exception e) {}
 							}
 						}
 						
diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
index 35fd2c31c..5e430c18d 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
@@ -204,6 +204,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
 			}
 
 			prevEnergy = getEnergy();
+			
 			if(!(gasTank.getGasType() == null || gasTank.getStored() == 0))
 			{
 				prevGas = gasTank.getGasType();