diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java
index bf6bdac82..be8c62aa8 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeListener.java
@@ -20,7 +20,7 @@ public class NetworkNodeListener {
 
             if (e.phase == TickEvent.Phase.END) {
                 for (INetworkNode node : API.instance().getNetworkNodeManager(e.world).all()) {
-                    if (node.getWorld() != null && e.world.isBlockLoaded(node.getPos())) {
+                    if (e.world.isBlockLoaded(node.getPos())) {
                         node.update();
                     }
                 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
index 694b6cd92..54bcf7ed1 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
@@ -75,7 +75,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA
 
     @Override
     public void markDirty() {
-        if (world != null && !world.isRemote) {
+        if (!world.isRemote) {
             API.instance().getNetworkNodeManager(world).markForSaving();
         }
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java
index 061403a14..9353b196f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java
@@ -27,20 +27,12 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
     private static final String NBT_TRIGGERED_AUTOCRAFTING = "TriggeredAutocrafting";
     private static final String NBT_BLOCKED = "Blocked";
 
-    private ItemHandlerBase patterns = new ItemHandlerBase(9, new ItemHandlerListenerNetworkNode(this), s -> {
-        // We can only validate the crafting pattern if the world exists.
-        // If the world doesn't exist, this is probably called while reading and in that case it doesn't matter.
-        if (world != null) {
-            return s.getItem() instanceof ICraftingPatternProvider && ((ICraftingPatternProvider) s.getItem()).create(world, s, this).isValid();
-        }
-
-        return true;
-    }) {
+    private ItemHandlerBase patterns = new ItemHandlerBase(9, new ItemHandlerListenerNetworkNode(this), s -> s.getItem() instanceof ICraftingPatternProvider && ((ICraftingPatternProvider) s.getItem()).create(world, s, this).isValid()) {
         @Override
         protected void onContentsChanged(int slot) {
             super.onContentsChanged(slot);
 
-            if (world != null && !world.isRemote) {
+            if (!world.isRemote) {
                 rebuildPatterns();
             }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java
index 3aa6f241a..ef71198d4 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java
@@ -34,7 +34,7 @@ public class NetworkNodeFluidInterface extends NetworkNode implements IComparabl
         protected void onContentsChanged() {
             super.onContentsChanged();
 
-            if (world != null && !world.isRemote) {
+            if (!world.isRemote) {
                 ((TileFluidInterface) world.getTileEntity(pos)).getDataManager().sendParameterToWatchers(TileFluidInterface.TANK_IN);
             }
 
@@ -47,7 +47,7 @@ public class NetworkNodeFluidInterface extends NetworkNode implements IComparabl
         protected void onContentsChanged() {
             super.onContentsChanged();
 
-            if (world != null && !world.isRemote) {
+            if (!world.isRemote) {
                 ((TileFluidInterface) world.getTileEntity(pos)).getDataManager().sendParameterToWatchers(TileFluidInterface.TANK_OUT);
             }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java
index 0e8a1dae7..fbb2968f3 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java
@@ -36,7 +36,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
         protected void onContentsChanged(int slot) {
             super.onContentsChanged(slot);
 
-            if (world != null && !world.isRemote) {
+            if (!world.isRemote) {
                 rebuildCards();
             }