From 35f5400ecbf802bf9bdcd602c9b04c9d7d2614ff Mon Sep 17 00:00:00 2001
From: slprime <31038811+slprime@users.noreply.github.com>
Date: Tue, 6 Oct 2026 19:57:10 +0300
Subject: [PATCH] Fix Crafting Tree NPE (#1064)

---
 src/main/java/codechicken/nei/bookmark/BookmarkStorage.java  | 5 +++++
 .../java/codechicken/nei/bookmark/tree/GuiCraftingTree.java  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkStorage.java b/src/main/java/codechicken/nei/bookmark/BookmarkStorage.java
index 23e9e987..95aa9d4f 100644
--- a/src/main/java/codechicken/nei/bookmark/BookmarkStorage.java
+++ b/src/main/java/codechicken/nei/bookmark/BookmarkStorage.java
@@ -198,6 +198,11 @@ public class BookmarkStorage {
                 final BookmarkItem item = BookmarkItem.of(parser.parse(itemStr).getAsJsonObject());
 
                 if (item != null) {
+
+                    if (!grid.groups.containsKey(item.groupId)) {
+                        item.groupId = BookmarkGrid.DEFAULT_GROUP_ID;
+                    }
+
                     grid.addItem(item, false);
                 } else {
                     wasError = true;
diff --git a/src/main/java/codechicken/nei/bookmark/tree/GuiCraftingTree.java b/src/main/java/codechicken/nei/bookmark/tree/GuiCraftingTree.java
index 229d1e37..14836079 100644
--- a/src/main/java/codechicken/nei/bookmark/tree/GuiCraftingTree.java
+++ b/src/main/java/codechicken/nei/bookmark/tree/GuiCraftingTree.java
@@ -162,7 +162,7 @@ public class GuiCraftingTree extends GuiContainer implements INEIGuiHandler, IGu
         final ItemTreeSlot replaceNode = this.uiState.replaceRecipeNode;
         this.uiState.replaceRecipeNode = null;
 
-        if (recipe != null) {
+        if (recipe != null && this.grid.getGroup(this.groupId) != null) {
             final RecipeId recipeId = recipe.getRecipeId();
             boolean changed = false;