--- old/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java	2016-04-25 14:50:58.000000000 -0700
+++ new/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java	2016-04-25 14:50:57.000000000 -0700
@@ -223,7 +223,7 @@
                             .append("\n");
                     sb.append("$DIR/java $JLINK_VM_OPTIONS -m ")
                             .append(module).append('/')
-                            .append(mainClass.get())
+                            .append(mainClass.getWhenPresent())
                             .append(" $@\n");
 
                     try (BufferedWriter writer = Files.newBufferedWriter(cmd,