diff -r da364e57250c -r aafc434ba580 hotspot/src/share/vm/classfile/javaClasses.cpp
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp	Mon Dec 05 18:00:34 2016 +0000
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp	Mon Dec 05 16:08:20 2016 -0500
@@ -802,7 +802,7 @@
     if (javabase_was_defined) {
       ModuleEntry *javabase_entry = ModuleEntryTable::javabase_moduleEntry();
       assert(javabase_entry != NULL && javabase_entry->module() != NULL,
-             "Setting class module field, java.base should be defined");
+             "Setting class module field, " JAVA_BASE_NAME " should be defined");
       Handle javabase_handle(THREAD, JNIHandles::resolve(javabase_entry->module()));
       set_module(mirror(), javabase_handle());
     }