Merge remote-tracking branch 'upstream/master'

runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java

@@ -389,6 +389,11 @@ public class ClueScrollPlugin extends Plugin
 
 			for (WorldPoint location : locations)
 			{
+				if (location == null)
+				{
+					continue;
+				}
+
 				// Only set the location hint arrow if we do not already have more accurate location
 				if (location.isInScene(client)
 					&& this.displayHintArrows

runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java

@@ -24,10 +24,10 @@
  */
 package net.runelite.client.plugins.raidsthieving.BatSolver;
 
+import java.util.HashMap;
 import java.util.Map;
 import net.runelite.api.Point;
 import net.runelite.client.plugins.raidsthieving.ThievingChest;
-import java.util.HashMap;
 
 public class ChestIdentifier
 {
@@ -251,7 +251,7 @@ public class ChestIdentifier
 
 	public void indentifyChest(ThievingChest chest)
 	{
-		int id = chestIds.get(chest.getInstancePoint());
+		int id = chestIds.getOrDefault(chest.getInstancePoint(), -1);
 		chest.setChestId(id);
 	}
 

runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java

@@ -192,7 +192,7 @@ public class ScreenMarkerPlugin extends Plugin
 
 	public void finishCreation(boolean aborted)
 	{
-		if (!aborted)
+		if (!aborted && currentMarker != null)
 		{
 			final ScreenMarkerOverlay screenMarkerOverlay = new ScreenMarkerOverlay(currentMarker);
 			screenMarkerOverlay.setPreferredLocation(overlay.getBounds().getLocation());