From d49ac4b9c95e20ba2962b8d9564a516ffd97c720 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Mon, 2 Jul 2018 22:59:00 +0200
Subject: [PATCH] Autoselect first tab when no tab is selected. (pt. 2)

---
 .../raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
index d9200b4dc..963d79c7f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
@@ -205,7 +205,11 @@ public class GuiCraftingMonitor extends GuiBase implements IResizableDisplay {
         Optional<UUID> currentTab = craftingMonitor.getTabSelected();
 
         if (currentTab.isPresent()) {
-            return getTabById(currentTab.get());
+            IGridTab tab = getTabById(currentTab.get());
+
+            if (tab != null) {
+                return tab;
+            }
         }
 
         if (tasks.isEmpty()) {