diff --git a/container/AEBaseContainer.java b/container/AEBaseContainer.java
index eba39e96..5a95de63 100644
--- a/container/AEBaseContainer.java
+++ b/container/AEBaseContainer.java
@@ -236,6 +236,8 @@ public abstract class AEBaseContainer extends Container
 			return tileEntity;
 		if ( part != null )
 			return part;
+		if ( obj != null )
+			return obj;
 		return null;
 	}