diff --git a/common/buildcraft/transport/PipeTransportLiquids.java b/common/buildcraft/transport/PipeTransportLiquids.java
index 548f8f87..f27d2719 100644
--- a/common/buildcraft/transport/PipeTransportLiquids.java
+++ b/common/buildcraft/transport/PipeTransportLiquids.java
@@ -164,8 +164,10 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine
 		if (!Utils.checkPipesConnections(container, entity))
 			return false;
 
-		if (entity instanceof TileGenericPipe){
-			if (!((TileGenericPipe)entity).pipe.inputOpen(o.reverse())){
+		if (entity instanceof TileGenericPipe) {
+			Pipe pipe = ((TileGenericPipe) entity).pipe;
+
+			if (pipe == null || !pipe.inputOpen(o.reverse())) {
 				return false;
 			}
 		}