--- old/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java	2016-12-07 23:01:48.000000000 -0800
+++ new/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java	2016-12-07 23:01:47.000000000 -0800
@@ -52,8 +52,8 @@
         String p = "/" + mod.name() + "/module-info.class";
         Optional<ResourcePoolEntry> content = mod.findEntry(p);
         if (!content.isPresent()) {
-              throw new PluginException("No module-info for " + mod.name()
-                      + " module");
+              throw new PluginException("module-info.class not found for " +
+                  mod.name() + " module");
         }
         ByteBuffer bb = ByteBuffer.wrap(content.get().contentBytes());
         return ModuleDescriptor.read(bb);