diff --git a/core/src/main/java/com/seibel/distanthorizons/core/world/AbstractDhServerWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/AbstractDhServerWorld.java
index d9f6f3691..68384b1be 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/world/AbstractDhServerWorld.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/world/AbstractDhServerWorld.java
@@ -67,14 +67,21 @@ public abstract class AbstractDhServerWorld<TDhServerLevel extends AbstractDhSer
 	@Override
 	public void removePlayer(IServerPlayerWrapper serverPlayer)
 	{
-		IServerLevelWrapper level = serverPlayer.getLevel();
-		if (level == null)
+		IServerLevelWrapper playerLevel = serverPlayer.getLevel();
+		if (playerLevel == null)
 		{
 			// can happen during server shutdown
 			return;
 		}
 		
-		this.getLevel(level).removePlayer(serverPlayer);
+		TDhServerLevel serverLevel = this.getLevel(playerLevel);
+		if (serverLevel == null)
+		{
+			// can happen during server shutdown
+			return;
+		}
+		
+		serverLevel.removePlayer(serverPlayer);
 		this.serverPlayerStateManager.unregisterLeftPlayer(serverPlayer);
 		
 		// If player's left, session is already closed
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/world/IDhWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/IDhWorld.java
index 5e79efeff..8b08827a3 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/world/IDhWorld.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/world/IDhWorld.java
@@ -22,6 +22,7 @@ package com.seibel.distanthorizons.core.world;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.Closeable;
 import java.util.concurrent.CompletableFuture;
@@ -31,6 +32,7 @@ public interface IDhWorld extends Closeable
 {
 	
 	IDhLevel getOrLoadLevel(@NotNull ILevelWrapper levelWrapper);
+	@Nullable
 	IDhLevel getLevel(@NotNull ILevelWrapper wrapper);
 	Iterable<? extends IDhLevel> getAllLoadedLevels();
 	int getLoadedLevelCount();