diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
index f76c08afd8..5b3c0fbcb8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
@@ -119,7 +119,7 @@ public class HiscorePanel extends PluginPanel
 		}
 		catch (IOException ex)
 		{
-			logger.warn(null, ex);
+			throw new RuntimeException(ex);
 		}
 
 		input = new IconTextField();
@@ -217,12 +217,14 @@ public class HiscorePanel extends PluginPanel
 		{
 			try
 			{
-				Icon icon = new ImageIcon(ImageIO.read(HiscorePanel.class.getResourceAsStream(endpoint.name() + ".png")));
-				Icon selected = new ImageIcon(ImageIO.read(HiscorePanel.class.getResourceAsStream(endpoint.name() + "_selected.png")));
+				Icon icon = new ImageIcon(ImageIO.read(HiscorePanel.class.getResourceAsStream(
+					endpoint.name().toLowerCase() + ".png")));
+				Icon selected = new ImageIcon(ImageIO.read(HiscorePanel.class.getResourceAsStream(
+					endpoint.name().toLowerCase() + "_selected.png")));
 				JToggleButton button = new JToggleButton();
 				button.setIcon(icon);
 				button.setSelectedIcon(selected);
-				button.setPreferredSize(new Dimension(24,24));
+				button.setPreferredSize(new Dimension(24, 24));
 				button.setBackground(Color.WHITE);
 				button.setFocusPainted(false);
 				button.setActionCommand(endpoint.name());
@@ -238,7 +240,7 @@ public class HiscorePanel extends PluginPanel
 			}
 			catch (IOException ex)
 			{
-				logger.warn(null, ex);
+				throw new RuntimeException(ex);
 			}
 		}
 
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
new file mode 100644
index 0000000000..9bb229da59
--- /dev/null
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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.plugins.hiscore;
+
+import net.runelite.client.RuneLite;
+import org.junit.Test;
+import static org.mockito.Mockito.mock;
+
+public class HiscorePanelTest
+{
+	@Test
+	public void testConstructor()
+	{
+		new HiscorePanel(mock(RuneLite.class));
+	}
+	
+}