--- old/src/java.base/share/classes/java/lang/reflect/Module.java	2016-04-25 14:50:35.000000000 -0700
+++ new/src/java.base/share/classes/java/lang/reflect/Module.java	2016-04-25 14:50:34.000000000 -0700
@@ -896,7 +896,7 @@
         while (layer != null) {
             if (layer.configuration() == cf) {
                 Optional<Module> om = layer.findModule(dn);
-                m = om.get();
+                m = om.getWhenPresent();
                 assert m.getLayer() == layer;
                 break;
             }