--- a/hotspot/src/share/vm/classfile/packageEntry.cpp	Mon Dec 05 18:00:34 2016 +0000
+++ b/hotspot/src/share/vm/classfile/packageEntry.cpp	Mon Dec 05 16:08:20 2016 -0500
@@ -293,7 +293,7 @@
           (module_name->fast_compare(vmSymbols::java_base()) == 0) &&
           !pkg_list->contains(entry->name())) {
         ResourceMark rm;
-        vm_exit_during_initialization("A non-java.base package was loaded prior to module system initialization", entry->name()->as_C_string());
+        vm_exit_during_initialization("A non-" JAVA_BASE_NAME " package was loaded prior to module system initialization", entry->name()->as_C_string());
       }
     }
   }