diff --git a/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java b/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java
index bebcc9711f..0e13537061 100644
--- a/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java
+++ b/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java
@@ -112,6 +112,11 @@ public class DiskStorage implements Storage
 	public byte[] readIndex(int indexId) throws IOException
 	{
 		IndexEntry entry = index255.read(indexId);
+		if (entry == null)
+		{
+			return null;
+		}
+
 		byte[] indexData = data.read(index255.getIndexFileId(), entry.getId(), entry.getSector(), entry.getLength());
 		return indexData;
 	}
@@ -121,6 +126,11 @@ public class DiskStorage implements Storage
 		logger.trace("Loading index {}", index.getId());
 
 		byte[] indexData = readIndex(index.getId());
+		if (indexData == null)
+		{
+			return;
+		}
+
 		Container res = Container.decompress(indexData, null);
 		byte[] data = res.data;