--- old/src/hotspot/share/classfile/classLoaderStats.cpp	2018-06-14 15:07:15.858495953 -0400
+++ new/src/hotspot/share/classfile/classLoaderStats.cpp	2018-06-14 15:07:14.472435674 -0400
@@ -102,17 +102,14 @@
 
 bool ClassLoaderStatsClosure::do_entry(oop const& key, ClassLoaderStats* const& cls) {
   Klass* class_loader_klass = (cls->_class_loader == NULL ? NULL : cls->_class_loader->klass());
+  ClassLoaderData* class_loader_data = (cls->_cld == NULL ? ClassLoaderData::the_null_class_loader_data() : cls->_cld);
   Klass* parent_klass = (cls->_parent == NULL ? NULL : cls->_parent->klass());
 
   _out->print(INTPTR_FORMAT "  " INTPTR_FORMAT "  " INTPTR_FORMAT "  " UINTX_FORMAT_W(6) "  " SIZE_FORMAT_W(8) "  " SIZE_FORMAT_W(8) "  ",
       p2i(class_loader_klass), p2i(parent_klass), p2i(cls->_cld),
       cls->_classes_count,
       cls->_chunk_sz, cls->_block_sz);
-  if (class_loader_klass != NULL) {
-    _out->print("%s", class_loader_klass->external_name());
-  } else {
-    _out->print("<boot class loader>");
-  }
+  _out->print("%s", class_loader_data->loader_name_and_id());
   _out->cr();
   if (cls->_anon_classes_count > 0) {
     _out->print_cr(SPACE SPACE SPACE "                                    " UINTX_FORMAT_W(6) "  " SIZE_FORMAT_W(8) "  " SIZE_FORMAT_W(8) "   + unsafe anonymous classes",