diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/ContainerCalculation.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/ContainerCalculation.java
index 58cd0f9e7c..5fc2a423b5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/ContainerCalculation.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/ContainerCalculation.java
@@ -51,7 +51,14 @@ class ContainerCalculation
 	ContainerPrices calculate(Item[] items)
 	{
 		// Returns last calculation if inventory hasn't changed
+
+		if (items == null)
+		{
+			return null;
+		}
+
 		final int newHash =  hashItems(items);
+		
 		if (containerPrices != null && hash == newHash)
 		{
 			return containerPrices;
@@ -86,7 +93,7 @@ class ContainerCalculation
 					final long storePrice = itemManager.getItemDefinition(id).getPrice();
 					final long alchPrice = (long) (storePrice * Constants.HIGH_ALCHEMY_MULTIPLIER);
 					alch += alchPrice * qty;
-					ge += itemManager.getItemPrice(id) * qty;
+					ge += (long) itemManager.getItemPrice(id) * qty;
 					break;
 			}