2 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
index b81bbb0337..11fb4f848f 100644
--- a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
+++ b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
@@ -128,7 +128,11 @@ public class CustomTileEntityPacket implements IMessage {
         @Override
         public IMessage onMessage(CustomTileEntityPacket message, MessageContext ctx) {
             if (!ModUtils.isClientSided) return null;
-            World w = Minecraft.getMinecraft().thePlayer.getEntityWorld();
+            Minecraft mc = Minecraft.getMinecraft();
+            if (mc == null) return null;
+            if (mc.thePlayer == null) return null;
+            World w = mc.thePlayer.getEntityWorld();
+            if (w == null) return null;
             if (message.w != w.provider.dimensionId) return null;
             TileEntity e = w.getTileEntity(message.x, message.y, message.z);
             if (e == null || e.isInvalid()) return null;
diff --git a/src/main/java/kubatech/api/network/LoadConfigPacket.java b/src/main/java/kubatech/api/network/LoadConfigPacket.java
index defb139151..03602e89f1 100644
--- a/src/main/java/kubatech/api/network/LoadConfigPacket.java
+++ b/src/main/java/kubatech/api/network/LoadConfigPacket.java
@@ -26,10 +26,12 @@ import io.netty.buffer.ByteBuf;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.HashSet;
+import kubatech.api.LoaderReference;
 import kubatech.config.Config;
 import kubatech.config.OverridesConfig;
 import kubatech.kubatech;
 import kubatech.loaders.MobRecipeLoader;
+import kubatech.loaders.TCLoader;
 
 public class LoadConfigPacket implements IMessage {
 
@@ -85,6 +87,7 @@ public class LoadConfigPacket implements IMessage {
         public IMessage onMessage(LoadConfigPacket message, MessageContext ctx) {
             kubatech.info("Received Mob Handler config, parsing");
             MobRecipeLoader.processMobRecipeMap(message.mobsToLoad, message.mobsOverrides);
+            if (LoaderReference.Thaumcraft) TCLoader.lateLoad();
             return null;
         }
     }