--- old/src/java.base/share/classes/sun/launcher/LauncherHelper.java	2016-04-25 14:50:52.000000000 -0700
+++ new/src/java.base/share/classes/sun/launcher/LauncherHelper.java	2016-04-25 14:50:52.000000000 -0700
@@ -529,7 +529,7 @@
             // should not happen
             throw new InternalError("Module " + mainModule + " not in boot Layer");
         }
-        Module m = om.get();
+        Module m = om.getWhenPresent();
 
         // get main class
         if (mainClass == null) {
@@ -537,7 +537,7 @@
             if (!omc.isPresent()) {
                 abort(null, "java.launcher.module.error1", mainModule);
             }
-            mainClass = omc.get();
+            mainClass = omc.getWhenPresent();
         }
 
         // load the class from the module
@@ -816,7 +816,7 @@
             }
 
             // load the FX launcher class
-            fxLauncherClass = Class.forName(om.get(), JAVAFX_LAUNCHER_CLASS_NAME);
+            fxLauncherClass = Class.forName(om.getWhenPresent(), JAVAFX_LAUNCHER_CLASS_NAME);
             if (fxLauncherClass == null) {
                 abort(null, "java.launcher.cls.error5");
             }