diff --git a/common/buildcraft/transport/pipes/PipeFluidsIron.java b/common/buildcraft/transport/pipes/PipeFluidsIron.java
index 3698a398..dafe22b5 100644
--- a/common/buildcraft/transport/pipes/PipeFluidsIron.java
+++ b/common/buildcraft/transport/pipes/PipeFluidsIron.java
@@ -83,14 +83,10 @@ public class PipeFluidsIron extends Pipe<PipeTransportFluids> {
 	public int getIconIndex(ForgeDirection direction) {
 		if (direction == ForgeDirection.UNKNOWN)
 			return standardIconIndex;
-		else {
-			int metadata = container.getBlockMetadata();
+		if (container != null && container.getBlockMetadata() == direction.ordinal())
+			return standardIconIndex;
+		return solidIconIndex;
 
-			if (metadata == direction.ordinal())
-				return solidIconIndex;
-			else
-				return standardIconIndex;
-		}
 	}
 
 	@Override
diff --git a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java
index 6cad55c5..7c030ef6 100644
--- a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java
+++ b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java
@@ -102,9 +102,11 @@ public class PipeItemsDaizuli extends Pipe<PipeTransportItems> implements IPipeT
 
 	@Override
 	public int getIconIndex(ForgeDirection direction) {
+		if (direction == ForgeDirection.UNKNOWN)
+			return standardIconIndex + color;
 		if (container != null && container.getBlockMetadata() == direction.ordinal())
-			return solidIconIndex;
-		return standardIconIndex + color;
+			return standardIconIndex + color;
+		return solidIconIndex;
 	}
 
 	@Override