diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 918cf7ee8..8e8362b2e 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -111,7 +111,7 @@ public class GuiGrid extends GuiBase {
     @Override
     public void drawForeground(int mouseX, int mouseY) {
         scrollbar.update(this, mouseX, mouseY);
-
+    synchronized (grid.getController()) {    
         drawString(7, 7, t("gui.refinedstorage:grid"));
 
         if (grid.getType() == EnumGridType.CRAFTING) {
@@ -133,9 +133,7 @@ public class GuiGrid extends GuiBase {
 
         for (int i = 0; i < 9 * getVisibleRows(); ++i) {
             if (slot < items.size()) {
-                StorageItem storageItem = items.get(slot);
-            	if(storageItem == null) continue;
-            	int qty = storageItem.getQuantity();
+            	int qty = items.get(slot).getQuantity();
 
                 String text;
 
@@ -192,6 +190,7 @@ public class GuiGrid extends GuiBase {
             drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear"));
         }
     }
+    }
 
     public List<StorageItem> getItems() {
         List<StorageItem> items = new ArrayList<StorageItem>();