--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp	Thu Nov 13 11:14:01 2014 +0100
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp	Fri Nov 14 09:47:09 2014 +0100
@@ -123,7 +123,7 @@
 
 ClassLoaderData* SystemDictionary::register_loader(Handle class_loader, TRAPS) {
   if (class_loader() == NULL) return ClassLoaderData::the_null_class_loader_data();
-  return ClassLoaderDataGraph::find_or_create(class_loader, CHECK_NULL);
+  return ClassLoaderDataGraph::find_or_create(class_loader, THREAD);
 }
 
 // ----------------------------------------------------------------------------