--- a/src/hotspot/share/classfile/verifier.cpp	Tue Apr 17 16:18:22 2018 -0400
+++ b/src/hotspot/share/classfile/verifier.cpp	Tue Nov 07 16:07:36 2017 -0500
@@ -2013,9 +2013,12 @@
     name, Handle(THREAD, loader), Handle(THREAD, protection_domain),
     true, THREAD);
 
-  if (log_is_enabled(Debug, class, resolve)) {
-    InstanceKlass* cur_class = InstanceKlass::cast(current_class());
-    Verifier::trace_class_resolution(kls, cur_class);
+  if (kls != NULL) {
+    current_class()->class_loader_data()->record_dependency(kls);
+    if (log_is_enabled(Debug, class, resolve)) {
+      InstanceKlass* cur_class = InstanceKlass::cast(current_class());
+      Verifier::trace_class_resolution(kls, cur_class);
+    }
   }
   return kls;
 }