--- old/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp	2018-06-13 19:38:24.064593434 -0400
+++ new/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp	2018-06-13 19:38:22.645450611 -0400
@@ -86,14 +86,9 @@
 
     // Note: this should also work if unloading:
     Klass* k = cld->class_loader_klass();
+    name = cld->loader_name();
     if (k != NULL) {
       class_name = k->external_name();
-      Symbol* s = cld->class_loader_name();
-      if (s != NULL) {
-        name = s->as_C_string();
-      }
-    } else {
-      name = "<bootstrap>";
     }
 
     // Print