diff --git a/src/main/java/com/seibel/lod/forge/wrappers/minecraft/MinecraftWrapper.java b/src/main/java/com/seibel/lod/forge/wrappers/minecraft/MinecraftWrapper.java
index ce4bec53c..993214672 100644
--- a/src/main/java/com/seibel/lod/forge/wrappers/minecraft/MinecraftWrapper.java
+++ b/src/main/java/com/seibel/lod/forge/wrappers/minecraft/MinecraftWrapper.java
@@ -60,6 +60,8 @@ import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.world.DimensionType;
 import net.minecraft.world.server.ServerWorld;
 
+import javax.annotation.Nullable;
+
 /**
  * A singleton that wraps the Minecraft class
  * to allow for easier movement between Minecraft versions.
@@ -275,7 +277,8 @@ public class MinecraftWrapper implements IMinecraftWrapper
 		}
 		return WorldWrapper.getWorldWrapper(serverWorld);
 	}
-	
+
+	@Nullable
 	@Override
 	public IWorldWrapper getWrappedClientWorld()
 	{
diff --git a/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java b/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java
index 15dbdfa0e..70103df3c 100644
--- a/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java
+++ b/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java
@@ -14,6 +14,8 @@ import net.minecraft.world.IWorld;
 import net.minecraft.world.server.ServerChunkProvider;
 import net.minecraft.world.server.ServerWorld;
 
+import javax.annotation.Nullable;
+
 /**
  * @author James Seibel
  * @author ??
@@ -39,9 +41,10 @@ public class WorldWrapper implements IWorldWrapper
 	}
 	
 	
-	
+	@Nullable
 	public static WorldWrapper getWorldWrapper(IWorld world)
 	{
+		if (world == null) return null;
 		//first we check if the biome has already been wrapped
 		if(worldWrapperMap.containsKey(world) && worldWrapperMap.get(world) != null)
 			return worldWrapperMap.get(world);