From ed5537da011aa01c3c4f96ce0ccea55f573c3a6b Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sun, 1 Oct 2017 13:39:00 +0200
Subject: [PATCH] Fixed Grid GUI crash, fixes #1469

---
 CHANGELOG.md                                             | 1 +
 .../raoulvdberge/refinedstorage/gui/grid/GuiGrid.java    | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b8264428..1d47948c1 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 1.5.19
 - Updated Forge to 2493 (MC 1.12.2) (raoulvdberge)
 - Fixed RS blocks requiring a pickaxe to be broken (raoulvdberge)
+- Fixed Grid GUI crash (raoulvdberge)
 
 ### 1.5.18
 - Added Project E integration for the External Storage on the Transmutation Table (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 f70621c82..6fa45face 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
@@ -230,8 +230,13 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
             scrollbar.setMaxOffset(getRows() - getVisibleRows());
         }
 
-        tabPageLeft.visible = grid.getTotalTabPages() > 0;
-        tabPageRight.visible = grid.getTotalTabPages() > 0;
+        if (tabPageLeft != null) {
+            tabPageLeft.visible = grid.getTotalTabPages() > 0;
+        }
+
+        if (tabPageRight != null) {
+            tabPageRight.visible = grid.getTotalTabPages() > 0;
+        }
     }
 
     @Override