diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
index f52eb7a..2704b29 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
@@ -122,6 +122,7 @@ public class EventHookContainer
 		if (!PocketManager.isLoaded())
 		{
 			PocketManager.load();
+            PocketManager.isConnected = true;
 		}
 	}
 
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/core/PocketManager.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/PocketManager.java
index 69f7678..9a5090c 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/core/PocketManager.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/core/PocketManager.java
@@ -63,7 +63,7 @@ public class PocketManager
 		{
             Point4D source = link.point;
             NewDimData dimension = getDimensionData(source.getDimension());
-            if (dimension.getLink(source.getX(), source.getY(), source.getZ()) == null)
+            if (dimension != null && dimension.getLink(source.getX(), source.getY(), source.getZ()) == null)
 			    dimension.createLink(source, LinkType.CLIENT, 0, link.lock);
 		}
 
@@ -72,7 +72,7 @@ public class PocketManager
 		{
 			Point4D source = link.point;
 			NewDimData dimension = getDimensionData(source.getDimension());
-            if (dimension.getLink(source.getX(),source.getY(),source.getZ()) != null)
+            if (dimension != null && dimension.getLink(source.getX(),source.getY(),source.getZ()) != null)
 			    dimension.deleteLink(source.getX(), source.getY(), source.getZ());
 		}
 
@@ -81,9 +81,10 @@ public class PocketManager
 		{
 			Point4D source = link.point;
 			NewDimData dimension = getDimensionData(source.getDimension());
-			DimLink dLink = dimension.getLink(source);
-			dLink.lock = link.lock;
-
+            if (dimension != null) {
+                DimLink dLink = dimension.getLink(source);
+                dLink.lock = link.lock;
+            }
 		}
 	}