diff --git a/CHANGELOG.md b/CHANGELOG.md
index c44c9fa8f..3a5cebfcd 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Fixed Exporter with Stack Upgrade not working correctly in Regulator Mode (raoulvdberge)
 - Fixed crash with the Constructor (raoulvdberge)
 - Fixed patterns being able to crash when no inputs are provided (raoulvdberge)
+- Fixed possible crash with network scanning (raoulvdberge)
 
 ### 1.5.23
 - Fixed duplication bug with autocrafting (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java
index 63bb12835..c387a12b7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java
@@ -182,10 +182,13 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
                 for (EnumFacing checkSide : EnumFacing.VALUES) {
                     if (checkSide != side) { // Avoid going backward
                         INetworkNodeProxy nodeOnSideProxy = NETWORK_NODE_PROXY_CAPABILITY.cast(tile.getCapability(NETWORK_NODE_PROXY_CAPABILITY, checkSide));
-                        INetworkNode nodeOnSide = nodeOnSideProxy.getNode();
 
-                        if (nodeOnSide == node) {
-                            operator.apply(world, pos.offset(checkSide), checkSide.getOpposite());
+                        if (nodeOnSideProxy != null) {
+                            INetworkNode nodeOnSide = nodeOnSideProxy.getNode();
+
+                            if (nodeOnSide == node) {
+                                operator.apply(world, pos.offset(checkSide), checkSide.getOpposite());
+                            }
                         }
                     }
                 }