diff --git a/common/buildcraft/core/TileBuffer.java b/common/buildcraft/core/TileBuffer.java
index f8e5ce9c..1b32f106 100644
--- a/common/buildcraft/core/TileBuffer.java
+++ b/common/buildcraft/core/TileBuffer.java
@@ -51,23 +51,29 @@ public class TileBuffer {
 	public int getBlockID() {
 		if (tile != null && !tile.isInvalid())
 			return blockID;
-		else {
-			if (tracker.markTimeIfDelay(world, 20))
-				refresh();
 
-			return blockID;
+		if (tracker.markTimeIfDelay(world, 20)) {
+			refresh();
+
+			if (tile != null && !tile.isInvalid())
+				return blockID;
 		}
+
+		return 0;
 	}
 
 	public TileEntity getTile() {
 		if (tile != null && !tile.isInvalid())
 			return tile;
-		else {
-			if (tracker.markTimeIfDelay(world, 20))
-				refresh();
 
-			return tile;
+		if (tracker.markTimeIfDelay(world, 20)) {
+			refresh();
+
+			if (tile != null && !tile.isInvalid())
+				return tile;
 		}
+
+		return null;
 	}
 
 }