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 6366c2bc30..ce8e105a3b 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
@@ -68,7 +68,18 @@ final class ClientPanel extends JPanel
 		else
 		{
 			logger.debug("Runelite is up to date");
-			rs = loader.loadRunelite();
+
+			try
+			{
+				rs = loader.loadRunelite();
+			}
+			catch (ClassNotFoundException ex)
+			{
+				logger.error("Unable to load client - class not found. This means you"
+					+ " are not running RuneLite with Maven as the injected client"
+					+ " is not in your classpath.");
+				throw new ClassNotFoundException("Unable to load injected client", ex);
+			}
 		}
 
 		rs.setLayout(null);
@@ -87,7 +98,7 @@ final class ClientPanel extends JPanel
 		if (!(rs instanceof Client))
 		{
 			logger.error("Injected client does not implement Client!");
-			System.exit(-1);
+			return;
 		}
 
 		Client client = (Client) rs;
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
index e8caf64e7f..19d529b596 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
@@ -95,7 +95,8 @@ public final class ClientUI extends JFrame
 			}
 			catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException ex)
 			{
-				logger.warn("Error loading RS!", ex);
+				logger.error("Error loading RS!", ex);
+				System.exit(-1);
 			}
 		}
 		container.add(panel, BorderLayout.CENTER);