diff --git a/src/main/java/tschipp/carryon/common/handler/ModelOverridesHandler.java b/src/main/java/tschipp/carryon/common/handler/ModelOverridesHandler.java
index cdf1b27..249fe64 100644
--- a/src/main/java/tschipp/carryon/common/handler/ModelOverridesHandler.java
+++ b/src/main/java/tschipp/carryon/common/handler/ModelOverridesHandler.java
@@ -102,7 +102,7 @@ public class ModelOverridesHandler
 			if (override.contains(":"))
 				modidOverride = override.replace(override.substring(override.indexOf(":")), "");
 
-			if ((Loader.isModLoaded(modidOverride) && Loader.isModLoaded(modidToOverride)) || (modidOverride.equals("minecraft") && modidToOverride.equals("minecraft")))
+			if (!errored && (Loader.isModLoaded(modidOverride) && Loader.isModLoaded(modidToOverride)) || (modidOverride.equals("minecraft") && modidToOverride.equals("minecraft")))
 			{
 				int meta = StringParser.getMeta(toOverride);
 				if (meta == 0)
diff --git a/src/main/java/tschipp/carryon/common/helper/StringParser.java b/src/main/java/tschipp/carryon/common/helper/StringParser.java
index 1cd3395..a543126 100644
--- a/src/main/java/tschipp/carryon/common/helper/StringParser.java
+++ b/src/main/java/tschipp/carryon/common/helper/StringParser.java
@@ -99,7 +99,7 @@ public class StringParser
 		Item item = getItem(string);
 		
 		if(item == null)
-			return ItemStack.EMPTY;
+			return null;
 		
 		ItemStack stack = new ItemStack(item, 1, getMeta(string));
 		NBTTagCompound tag = getTagCompound(string);