--- old/src/java.base/share/classes/java/lang/reflect/Layer.java	2016-04-25 14:50:33.000000000 -0700
+++ new/src/java.base/share/classes/java/lang/reflect/Layer.java	2016-04-25 14:50:33.000000000 -0700
@@ -362,7 +362,7 @@
         Objects.requireNonNull(cf);
 
         Optional<Configuration> oparent = cf.parent();
-        if (!oparent.isPresent() || oparent.get() != this.configuration()) {
+        if (!oparent.isPresent() || oparent.getWhenPresent() != this.configuration()) {
             throw new IllegalArgumentException(
                     "Parent of configuration != configuration of this Layer");
         }
@@ -520,7 +520,7 @@
             return m.getClassLoader();
         Optional<Layer> ol = parent();
         if (ol.isPresent())
-            return ol.get().findLoader(name);
+            return ol.getWhenPresent().findLoader(name);
         throw new IllegalArgumentException("Module " + name
                                            + " not known to this layer");
     }