diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
index 011dd53e6..e68cd2ccd 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
@@ -265,6 +265,12 @@ public class WorldGenerationQueue implements IWorldGenerationQueue, IDebugRender
 				entry -> new Mapper(entry.getValue(), entry.getValue().pos.getSectionBBoxPos().getCenterBlockPos().toPos2D().chebyshevDist(targetPos.toPos2D())),
 				(aMapper, bMapper) -> aMapper.dist < bMapper.dist ? aMapper : bMapper);
 		
+		if (closestTaskMap == null)
+		{
+			// FIXME concurrency issue
+			return false;
+		}
+		
 		WorldGenTask closestTask = closestTaskMap.task;
 		
 		// remove the task we found, we are going to start it and don't want to run it multiple times