--- old/src/java.base/share/classes/jdk/internal/loader/BootLoader.java	2016-04-25 14:50:44.000000000 -0700
+++ new/src/java.base/share/classes/jdk/internal/loader/BootLoader.java	2016-04-25 14:50:44.000000000 -0700
@@ -239,7 +239,7 @@
                 Optional<Module> om = Layer.boot().findModule(mn);
                 if (!om.isPresent())
                     throw new InternalError(mn + " not in boot layer");
-                return om.get();
+                return om.getWhenPresent();
             }
 
             return null;