From 166eb9dbfb13d88ca8865c26b2a682dd29a83e11 Mon Sep 17 00:00:00 2001
From: Shadowrs <shadow_jak@hotmail.co.uk>
Date: Tue, 28 Aug 2018 16:33:57 +0100
Subject: [PATCH] NPE Fix

---
 .../java/org/parabot/core/ui/ServerSelector.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/parabot/core/ui/ServerSelector.java b/src/main/java/org/parabot/core/ui/ServerSelector.java
index 5b76fdd..289712d 100755
--- a/src/main/java/org/parabot/core/ui/ServerSelector.java
+++ b/src/main/java/org/parabot/core/ui/ServerSelector.java
@@ -85,11 +85,13 @@ public class ServerSelector extends JPanel {
             }
         }
 
-        final String serverName = initServer.toLowerCase(); // match the pre-requested server name to quick-launch
-        for (ServerComponent widget : widgets) {
-            if (widget.desc.getServerName().toLowerCase().equals(serverName)) {
-                Environment.load(widget.desc);
-                return true;
+        if (initServer != null) {
+            final String serverName = initServer.toLowerCase(); // match the pre-requested server name to quick-launch
+            for (ServerComponent widget : widgets) {
+                if (widget.desc.getServerName().toLowerCase().equals(serverName)) {
+                    Environment.load(widget.desc);
+                    return true;
+                }
             }
         }
         return false;