diff --git a/CHANGELOG.md b/CHANGELOG.md
index afe8cde..c6db744 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Refined Pipes Changelog
 
 ## 0.3
+Note: Due to fluid networks now being split up by their tier, all fluid pipes from version 0.2.1 and earlier are incompatible and won't be functioning. This can be fixed by breaking and replacing all the fluid pipes in a network.
+
 - Implemented pick block on attachments (raoulvdberge)
 - Improved performance of calculating pipe shapes (raoulvdberge)
 - Added energy pipes (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedpipes/network/NetworkManager.java b/src/main/java/com/raoulvdberge/refinedpipes/network/NetworkManager.java
index a988084..c8d9079 100644
--- a/src/main/java/com/raoulvdberge/refinedpipes/network/NetworkManager.java
+++ b/src/main/java/com/raoulvdberge/refinedpipes/network/NetworkManager.java
@@ -144,7 +144,7 @@ public void removePipe(BlockPos pos) {
         }
 
         if (pipe.getNetwork() == null) {
-            throw new RuntimeException("Pipe has no network");
+            LOGGER.warn("Removed pipe at {} has no associated network", pipe.getPos());
         }
 
         pipes.remove(pipe.getPos());
@@ -153,7 +153,9 @@ public void removePipe(BlockPos pos) {
 
         markDirty();
 
-        splitNetworks(pipe);
+        if (pipe.getNetwork() != null) {
+            splitNetworks(pipe);
+        }
     }
 
     private void splitNetworks(Pipe originPipe) {