diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ClassesToRetransformFinder.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ClassesToRetransformFinder.java
index 31a85c76fc6..d91a159a914 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ClassesToRetransformFinder.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ClassesToRetransformFinder.java
@@ -43,6 +43,11 @@ public List<Class<?>> getAllLoadedChangedClasses(
     List<Class<?>> classesToBeTransformed = new ArrayList<>();
     Trie changedClasses = getAllChangedClasses(comparer);
     for (Class<?> clazz : allLoadedClasses) {
+      if (clazz == null) {
+        // clazz could be null in the array returned by Instrumentation::getAllLoadedClasses
+        // probably because class unloading
+        continue;
+      }
       if (lookupClass(changedClasses, clazz)) {
         classesToBeTransformed.add(clazz);
       }