diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java
index f22366e0a..c0fc2e74a 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java
@@ -175,6 +175,11 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
     @Override
     public ILevelWrapper getWrappedClientWorld()
     {
+		if (mc.level == null)
+		{
+			return null;
+		}
+		
         return ClientLevelWrapper.getWrapper(mc.level);
     }
 
diff --git a/coreSubProjects b/coreSubProjects
index 70369fa46..cc474caf3 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 70369fa468cb50934a780094ea3f5052cf2f333d
+Subproject commit cc474caf33e652ee64c911c2d918e48737cd32a9