diff --git a/src/main/java/dan200/computercraft/shared/util/InventoryUtil.java b/src/main/java/dan200/computercraft/shared/util/InventoryUtil.java
index 3e13a9eb1..089c82e43 100644
--- a/src/main/java/dan200/computercraft/shared/util/InventoryUtil.java
+++ b/src/main/java/dan200/computercraft/shared/util/InventoryUtil.java
@@ -78,7 +78,7 @@ public final class InventoryUtil
         if( y >= 0 && y < world.getHeight() )
         {
             BlockEntity tileEntity = world.getBlockEntity( pos );
-            if( tileEntity != null )
+            if( tileEntity instanceof Inventory )
             {
                 return (Inventory) tileEntity;
             }