--- old/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java	2016-04-25 14:50:49.000000000 -0700
+++ new/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java	2016-04-25 14:50:48.000000000 -0700
@@ -104,7 +104,7 @@
         Optional<ModuleReference> obase = systemModulePath.find(JAVA_BASE);
         if (!obase.isPresent())
             throw new InternalError(JAVA_BASE + " not found");
-        ModuleReference base = obase.get();
+        ModuleReference base = obase.getWhenPresent();
         BootLoader.loadModule(base);
         Modules.defineModule(null, base.descriptor(), base.location().orElse(null));
 
@@ -306,7 +306,7 @@
         for (String mod : otherMods) {
             Optional<ModuleReference> omref = finder.find(mod);
             if (omref.isPresent()) {
-                ModuleReference mref = omref.get();
+                ModuleReference mref = omref.getWhenPresent();
                 map.putIfAbsent(mod, mref);
                 mrefs.add(mref);
             } else {
@@ -362,7 +362,7 @@
             Optional<Module> om = bootLayer.findModule(mn);
             if (!om.isPresent())
                 fail("Unknown module: " + mn);
-            Module m = om.get();
+            Module m = om.getWhenPresent();
 
             // the value is the set of other modules (by name)
             for (String name : e.getValue()) {
@@ -374,7 +374,7 @@
                     om = bootLayer.findModule(name);
                     if (!om.isPresent())
                         fail("Unknown module: " + name);
-                    other = om.get();
+                    other = om.getWhenPresent();
                 }
 
                 Modules.addReads(m, other);
@@ -408,7 +408,7 @@
             Optional<Module> om = bootLayer.findModule(mn);
             if (!om.isPresent())
                 fail("Unknown module: " + mn);
-            m = om.get();
+            m = om.getWhenPresent();
 
             // the value is the set of modules to export to (by name)
             for (String name : e.getValue()) {
@@ -419,7 +419,7 @@
                 } else {
                     om = bootLayer.findModule(name);
                     if (om.isPresent()) {
-                        other = om.get();
+                        other = om.getWhenPresent();
                     } else {
                         fail("Unknown module: " + name);
                     }