diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java
index 025a24f3..2e2756d1 100644
--- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java
+++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java
@@ -36,7 +36,18 @@ public class EventHookContainer
     @ForgeSubscribe
     public void onWorldLoad(WorldEvent.Load event)
     {
-    	RiftRegenerator.regenerateRiftsInAllWorlds();
+    	// We need to initialize PocketManager here because onServerAboutToStart fires before we can
+    	// use DimensionManager and onServerStarting fires after the game tries to generate terrain.
+    	// If a gateway tries to generate before PocketManager has initialized, we get a crash.
+    	if (!PocketManager.isLoaded())
+    	{
+    		PocketManager.load();
+    	}
+    	
+    	if (PocketManager.isLoaded())
+    	{
+    		RiftRegenerator.regenerateRiftsInAllWorlds();
+    	}
     }
     
     @ForgeSubscribe
diff --git a/StevenDimDoors/mod_pocketDim/core/NewDimData.java b/StevenDimDoors/mod_pocketDim/core/NewDimData.java
index 0be64688..40fe18d4 100644
--- a/StevenDimDoors/mod_pocketDim/core/NewDimData.java
+++ b/StevenDimDoors/mod_pocketDim/core/NewDimData.java
@@ -127,7 +127,7 @@ public abstract class NewDimData
 		IUpdateWatcher<Point4D> linkWatcher)
 	{
 		// The isPocket flag is redundant. It's meant as an integrity safeguard.
-		if (isPocket == (parent != null))
+		if (isPocket != (parent != null))
 		{
 			throw new NullPointerException("Dimensions can be pocket dimensions if and only if they have a parent dimension.");
 		}
diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
index c7cd4675..4ab50589 100644
--- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -384,6 +384,5 @@ public class mod_pocketDim
 		CommandCreatePocket.instance().register(event);
 		CommandTeleportPlayer.instance().register(event);
 		*/
-		PocketManager.load();
 	}
 }