From d4c85569e1ad7d7070409b218363e9dcdd89446b Mon Sep 17 00:00:00 2001
From: Adrian <kontakt@asie.pl>
Date: Sun, 14 Jun 2015 12:29:38 +0200
Subject: [PATCH] fix #2801

---
 common/buildcraft/transport/BlockGenericPipe.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java
index 54f5f986..1e440a1f 100644
--- a/common/buildcraft/transport/BlockGenericPipe.java
+++ b/common/buildcraft/transport/BlockGenericPipe.java
@@ -415,11 +415,11 @@ public class BlockGenericPipe extends BlockBuildCraft implements IColorRemovable
 			pipeRemoved.clear();
 		}
 
-		pipeRemoved.put(new BlockIndex(x, y, z), pipe);
-		world.removeTileEntity(x, y, z);
 		if (pipe != null) {
+			pipeRemoved.put(new BlockIndex(x, y, z), pipe);
 			updateNeighbourSignalState(pipe);
 		}
+		world.removeTileEntity(x, y, z);
 	}
 
 	@Override