--- old/src/hotspot/share/classfile/systemDictionaryShared.cpp	2018-03-02 22:44:34.763187490 -0500
+++ new/src/hotspot/share/classfile/systemDictionaryShared.cpp	2018-03-02 22:44:34.130860947 -0500
@@ -497,7 +497,7 @@
     // Fix for 4474172; see evaluation for more details
     class_loader = Handle(
       THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader()));
-    ClassLoaderData *loader_data = register_loader(class_loader, CHECK_NULL);
+    ClassLoaderData *loader_data = register_loader(class_loader);
     Dictionary* dictionary = loader_data->dictionary();
 
     unsigned int d_hash = dictionary->compute_hash(name);