diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
index 856fee5e..3a0cc011 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -318,14 +318,17 @@ public class mod_pocketDim
 		try
 		{
 			PocketManager.tryUnload();
-			deathTracker.writeToFile();
-			deathTracker = null;
+            if (deathTracker != null) {
+                deathTracker.writeToFile();
+                deathTracker = null;
+            }
 			worldProperties = null;
 			currrentSaveRootDirectory = null;
 			
 			// Unregister all tick receivers from serverTickHandler to avoid leaking
 			// scheduled tasks between single-player game sessions
-			serverTickHandler.unregisterReceivers();
+            if (serverTickHandler != null)
+			    serverTickHandler.unregisterReceivers();
 			spawner = null;
 			riftRegenerator = null;
 			limboDecayScheduler = null;