diff --git a/analysis/heap-dump/provider/src/main/java/org/eclipse/jifa/hdp/provider/HeapDumpAnalysisApiExecutor.java b/analysis/heap-dump/provider/src/main/java/org/eclipse/jifa/hdp/provider/HeapDumpAnalysisApiExecutor.java
index 0193bade..40c04938 100644
--- a/analysis/heap-dump/provider/src/main/java/org/eclipse/jifa/hdp/provider/HeapDumpAnalysisApiExecutor.java
+++ b/analysis/heap-dump/provider/src/main/java/org/eclipse/jifa/hdp/provider/HeapDumpAnalysisApiExecutor.java
@@ -197,7 +197,9 @@ protected HeapDumpAnalyzer buildAnalyzer(Path target, Map<String, String> option
 
     @Override
     protected void cachedAnalyzerRemoved(HeapDumpAnalyzer heapDumpAnalyzer) {
-        heapDumpAnalyzer.dispose();
+        if (heapDumpAnalyzer != null) {
+            heapDumpAnalyzer.dispose();
+        }
     }
 
     private File indexFile(Path target) {