diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java
index fa1c813aa..4667d7667 100644
--- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java
+++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java
@@ -342,6 +342,8 @@ public boolean isSideSolid (IBlockAccess world, int x, int y, int z, ForgeDirect
                 return false;
         }
 
+        if (getTileEntity(world, x, y, z) == null)
+            return true;
         if (side.ordinal() != getTileEntity(world, x, y, z).getDirection())
             return true;
 
diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java
index 43b13877d..cc555c755 100644
--- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java
+++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityController.java
@@ -209,10 +209,8 @@ private void populateNode (int x, int y, int z, int depth) {
         if (te == null || !(te instanceof IDrawerGroup))
             return;
 
-        //if (te instanceof TileEntityController && depth < DEPTH_LIMIT) {
-        //    populateNeighborNodes(x, y, z, depth + 1);
-        //    return;
-        //}
+        if (depth > DEPTH_LIMIT)
+            return;
 
         BlockCoord coord = new BlockCoord(x, y, z);
         StorageRecord record = storage.get(coord);