2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index 294fea996e..5e7c96a0c3 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -614,8 +614,8 @@ public class RecipeUtils {
                 GameRegistry.addRecipe(mRecipe);
             } else {
                 Logger.RECIPE(
-                        "[Fix] Invalid shapped recipe outputting " + mOutput != null ? mOutput.getDisplayName()
-                                : "Bad Output Item");
+                        "[Fix] Invalid shapped recipe outputting "
+                                + (mOutput != null ? mOutput.getDisplayName() : "Bad Output Item"));
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java
index 650ecfa55e..b816489418 100644
--- a/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java
+++ b/src/main/java/gtPlusPlus/xmod/bartworks/BW_Utils.java
@@ -21,6 +21,8 @@ public class BW_Utils {
     }
 
     public static ItemStack getCorrespondingItemStack(OrePrefixes orePrefixes, short werkstoffID, int amount) {
+        Werkstoff werkstoff = Werkstoff.werkstoffHashMap.get(werkstoffID);
+        if (werkstoff == null) return null;
         return WerkstoffLoader
                 .getCorrespondingItemStackUnsafe(orePrefixes, Werkstoff.werkstoffHashMap.get(werkstoffID), amount);
     }