Merge branch 'HbmMods:master' into master

src/main/java/com/hbm/main/MainRegistry.java

@@ -955,6 +955,8 @@ public class MainRegistry {
 		WeaponConfig.loadFromConfig(config);
 		MobConfig.loadFromConfig(config);
 		StructureConfig.loadFromConfig(config);
+
+		config.save();
 		
 		try {
 			if(GeneralConfig.enableThermosPreventer && Class.forName("thermos.Thermos") != null) {
@@ -967,8 +969,6 @@ public class MainRegistry {
 						+ "change Thermos' config anyway so that extra change in NTM's config can't be that big of a burden.");
 			}
 		} catch(ClassNotFoundException e) { }
-
-		config.save();
 	}
 	
 	private static HashSet<String> ignoreMappings = new HashSet();

src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java

@@ -308,6 +308,7 @@ public class TileEntityElectrolyser extends TileEntityMachineBase implements IEn
 		if(this.tanks[3].getFill() < 100) return false;
 		
 		ElectrolysisMetalRecipe recipe = ElectrolyserMetalRecipes.getRecipe(slots[14]);
+		if(recipe == null) return false;
 		
 		if(leftStack != null) {
 			if(recipe.output1.material != leftStack.material) return false;