diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/threading/ThreadPools.java b/core/src/main/java/com/seibel/distanthorizons/core/util/threading/ThreadPools.java
index f5899ac4e..535ade292 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/util/threading/ThreadPools.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/util/threading/ThreadPools.java
@@ -141,9 +141,12 @@ public class ThreadPools
 		ThreadPools.bufferBuilderThreadPool.shutdownExecutorService();
 		
 		workerThreadSemaphore = null;
-		workerThreadSemaphoreConfigListener.close();
-		workerThreadSemaphoreConfigListener = null;
 		
+		if (workerThreadSemaphoreConfigListener != null)
+		{
+			workerThreadSemaphoreConfigListener.close();
+			workerThreadSemaphoreConfigListener = null;
+		}
 	}
 	
 }