From 345d1971719781dfb7e1893bda986736a65819b8 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Fri, 21 Apr 2017 22:35:31 -0400
Subject: [PATCH] Fix a couple npes if the client isnt' loaded

---
 .../net/runelite/client/menus/MenuManager.java   |  8 +++++++-
 .../java/net/runelite/client/ui/ClientPanel.java | 16 +++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
index 7eb5a2c7be..5469e523a2 100644
--- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
@@ -138,7 +138,13 @@ public class MenuManager
 	{
 		int index = IDX_LOWER;
 
-		String[] playerOptions = RuneLite.getClient().getPlayerOptions();
+		Client client = RuneLite.getClient();
+		if (client == null)
+		{
+			return IDX_UPPER;
+		}
+
+		String[] playerOptions = client.getPlayerOptions();
 		while (index < IDX_UPPER && playerOptions[index] != null)
 		{
 			index++;
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientPanel.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientPanel.java
index fc3f36fbea..1c080e4806 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/ClientPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientPanel.java
@@ -22,7 +22,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 package net.runelite.client.ui;
 
 import java.applet.Applet;
@@ -40,9 +39,9 @@ import org.slf4j.LoggerFactory;
 final class ClientPanel extends JPanel implements ComponentListener
 {
 	private static final Logger logger = LoggerFactory.getLogger(ClientPanel.class);
-	
+
 	public static final int PANEL_WIDTH = 765, PANEL_HEIGHT = 503;
-	
+
 	private Applet rs;
 
 	public ClientPanel() throws Exception
@@ -78,10 +77,13 @@ final class ClientPanel extends JPanel implements ComponentListener
 	@Override
 	public void componentResized(ComponentEvent e)
 	{
-		rs.setLocation(0, 0);
-		rs.setSize(this.getSize());
+		if (rs != null)
+		{
+			rs.setLocation(0, 0);
+			rs.setSize(this.getSize());
+			rs.setPreferredSize(this.getPreferredSize());
+		}
 		this.setPreferredSize(this.getSize());
-		rs.setPreferredSize(this.getPreferredSize());
 	}
 
 	@Override
@@ -98,4 +100,4 @@ final class ClientPanel extends JPanel implements ComponentListener
 	public void componentHidden(ComponentEvent e)
 	{
 	}
-}
\ No newline at end of file
+}