diff --git a/src/class_linker.cc b/src/class_linker.cc
index 2f1dc9a..0e9e43a 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1929,9 +1929,9 @@
   CHECK(oat_class.get() != NULL) << descriptor;
   Class::Status status = oat_class->GetStatus();
   if (status == Class::kStatusError) {
-    // TODO: include appropriate verify_error_class_ information in oat file for use here.
-    ThrowNoClassDefFoundError("Class failed compile-time verification: %s",
-                              PrettyDescriptor(klass).c_str());
+    Thread* self = Thread::Current();
+    self->ThrowNewExceptionF("Ljava/lang/VerifyError;", "Compile-time verification of %s failed",
+        PrettyDescriptor(klass).c_str());
     klass->SetStatus(Class::kStatusError);
     return true;
   }