--- old/src/java.base/share/classes/java/lang/NamedPackage.java	2016-04-25 14:50:24.000000000 -0700
+++ new/src/java.base/share/classes/java/lang/NamedPackage.java	2016-04-25 14:50:24.000000000 -0700
@@ -75,7 +75,7 @@
         if (module.isNamed() && module.getLayer() != null) {
             Configuration cf = module.getLayer().configuration();
             ModuleReference mref
-                = cf.findModule(module.getName()).get().reference();
+                = cf.findModule(module.getName()).getWhenPresent().reference();
             return mref.location().orElse(null);
         }
         return null;