diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
index bbd2131d6..049dc4f1a 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
@@ -41,7 +41,6 @@ import de.ellpeck.actuallyadditions.mod.util.FakePlayerUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.init.Items;
-import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.Mod.Instance;
@@ -126,11 +125,7 @@ public class ActuallyAdditions{
 
     @EventHandler
     public void serverStarted(FMLServerStartedEvent event){
-        if(LaserRelayConnectionHandler.getInstance() == null){
-            LaserRelayConnectionHandler.setInstance(new LaserRelayConnectionHandler());
-        }
-
-        WorldData.init(MinecraftServer.getServer());
+        WorldData.init();
     }
 
     @EventHandler
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java
index 602ca99b7..fe7e47fe2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/event/WorldLoadingEvents.java
@@ -10,7 +10,6 @@
 
 package de.ellpeck.actuallyadditions.mod.event;
 
-import de.ellpeck.actuallyadditions.mod.misc.LaserRelayConnectionHandler;
 import de.ellpeck.actuallyadditions.mod.misc.WorldData;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -19,9 +18,7 @@ public class WorldLoadingEvents{
 
     @SubscribeEvent
     public void onLoad(WorldEvent.Load event){
-        if(LaserRelayConnectionHandler.getInstance() == null){
-            LaserRelayConnectionHandler.setInstance(new LaserRelayConnectionHandler());
-        }
+        WorldData.makeDirty();
     }
 
     @SubscribeEvent
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java
index c2f77f41c..fec5a2ad4 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java
@@ -33,13 +33,12 @@ public class LaserRelayConnectionHandler{
     public ConcurrentSet<Network> networks = new ConcurrentSet<Network>();
 
     public static LaserRelayConnectionHandler getInstance(){
+        if(instance == null){
+            instance = new LaserRelayConnectionHandler();
+        }
         return instance;
     }
 
-    public static void setInstance(LaserRelayConnectionHandler handler){
-        instance = handler;
-    }
-
     public NBTTagCompound writeNetworkToNBT(Network network){
         NBTTagList list = new NBTTagList();
         for(ConnectionPair pair : network.connections){
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java
index b551acbb7..95a7cb4f2 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/WorldData.java
@@ -33,7 +33,8 @@ public class WorldData extends WorldSavedData{
         }
     }
 
-    public static void init(MinecraftServer server){
+    public static void init(){
+        MinecraftServer server = MinecraftServer.getServer();
         if(server != null){
             World world = server.getEntityWorld();
             if(!world.isRemote){