diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 3ce054d61..1d946f1e2 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -220,10 +220,12 @@ public class GuiGrid extends GuiBase {
         items.sort(new Comparator<StorageItem>() {
             @Override
             public int compare(StorageItem o1, StorageItem o2) {
-                if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) {
-                    return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName());
-                } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) {
-                    return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName());
+                if (o1 != null && o2 != null) {
+                    if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) {
+                        return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName());
+                    } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) {
+                        return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName());
+                    }
                 }
 
                 return 0;
@@ -234,10 +236,12 @@ public class GuiGrid extends GuiBase {
             items.sort(new Comparator<StorageItem>() {
                 @Override
                 public int compare(StorageItem o1, StorageItem o2) {
-                    if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) {
-                        return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity());
-                    } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) {
-                        return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity());
+                    if (o1 != null && o2 != null) {
+                        if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) {
+                            return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity());
+                        } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) {
+                            return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity());
+                        }
                     }
 
                     return 0;