1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index c0a89e723c..eb556f0a44 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -367,6 +367,15 @@ public class GT_Achievements {
     }
 
     public Achievement registerAssAchievement(GT_Recipe recipe) {
+        if (recipe == null) {
+            GT_Mod.GT_FML_LOGGER.error("Invalid achievement registration attempt for null recipe", new Exception());
+            return null;
+        }
+        if (recipe.getOutput(0) == null) {
+            GT_Mod.GT_FML_LOGGER.error(
+                    "Invalid achievement registration attempt for recipe with null output", new Exception());
+            return null;
+        }
         if (this.achievementList.get(recipe.getOutput(0).getUnlocalizedName()) == null) {
             assReg++;
             return registerAchievement(