1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc
index 46162c1989..11e02a2ce4 100644
--- a/runtime/native/java_lang_VMClassLoader.cc
+++ b/runtime/native/java_lang_VMClassLoader.cc
@@ -57,8 +57,12 @@ class VMClassLoader {
       REQUIRES_SHARED(Locks::mutator_lock_) {
     ObjPtr<mirror::Class> result;
     if (cl->FindClassInBaseDexClassLoader(soa, self, descriptor, hash, class_loader, &result)) {
+      DCHECK(!self->IsExceptionPending());
       return result;
     }
+    if (self->IsExceptionPending()) {
+      self->ClearException();
+    }
     return nullptr;
   }
 };