From 4b1fd70395b0789284d36aee6eec32298e295fae Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Tue, 18 Apr 2017 21:33:00 +0200
Subject: [PATCH] Fixes #1165

---
 CHANGELOG.md                                                  | 1 +
 .../com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e19dd75d..7d7ce1879 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - You can now shift click Grid Filters into a Grid instead of manually inserting them (raoulvdberge)
 - The Solderer inventory isn't sided anymore (raoulvdberge)
 - You can now use up and down arrows to scroll through Grid search history (raoulvdberge)
+- Fixed Grid crash (raoulvdberge)
 
 ### 1.4.2
 - Updated Forge to 2261 (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
index 1bf023fb6..451eb9182 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
@@ -421,7 +421,9 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
             drawTexture(x + 152, y + getTabDelta() + getHeader() + (getVisibleRows() * 18) + 22, 240, ty * 16, 16, 16);
         }
 
-        searchField.drawTextBox();
+        if (searchField != null) {
+            searchField.drawTextBox();
+        }
     }
 
     @Override