diff --git a/dependencies.gradle b/dependencies.gradle
index 47d19c113..bcf064173 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,8 +1,8 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:CodeChickenCore:1.4.0:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.6.0:dev')
+    api('com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.6.1:dev')
 
     shadowImplementation('org.apache.commons:commons-csv:1.10.0')
 }
diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java
index 50078c81f..6e51761e4 100644
--- a/src/main/java/codechicken/nei/ClientHandler.java
+++ b/src/main/java/codechicken/nei/ClientHandler.java
@@ -325,9 +325,8 @@ public void loadWorld(World world, boolean fromServer) {
 
                 if (!Minecraft.getMinecraft().isSingleplayer()) // wait for server to initiate in singleplayer
                     NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
-
-                ItemMobSpawner.clearEntityReferences(world);
             }
+            ItemMobSpawner.clearEntityReferences(world);
 
             lastworld = world;
         }
diff --git a/src/main/java/codechicken/nei/ItemsTooltipLineHandler.java b/src/main/java/codechicken/nei/ItemsTooltipLineHandler.java
index 110090029..24ddc58cf 100644
--- a/src/main/java/codechicken/nei/ItemsTooltipLineHandler.java
+++ b/src/main/java/codechicken/nei/ItemsTooltipLineHandler.java
@@ -123,6 +123,8 @@ private List<ItemStack> groupingItemStacks(List<ItemStack> items) {
 
         for (ItemStack stack : items) {
             final NBTTagCompound nbTag = StackInfo.itemStackToNBT(stack, true);
+            if (nbTag == null) continue;
+
             final String GUID = StackInfo.getItemStackGUID(stack);
 
             if (!unique.containsKey(GUID)) {