--- old/src/java.base/share/classes/jdk/internal/loader/Loader.java	2016-04-25 14:50:46.000000000 -0700
+++ new/src/java.base/share/classes/jdk/internal/loader/Loader.java	2016-04-25 14:50:46.000000000 -0700
@@ -117,7 +117,7 @@
             URL url = null;
             if (mref.location().isPresent()) {
                 try {
-                    url = mref.location().get().toURL();
+                    url = mref.location().getWhenPresent().toURL();
                 } catch (MalformedURLException e) { }
             }
             this.mref = mref;
@@ -205,7 +205,7 @@
 
         for (String name : nameToModule.keySet()) {
 
-            ResolvedModule resolvedModule = cf.findModule(name).get();
+            ResolvedModule resolvedModule = cf.findModule(name).getWhenPresent();
             assert resolvedModule.configuration() == cf;
 
             for (ResolvedModule other : resolvedModule.reads()) {
@@ -307,7 +307,7 @@
                         Optional<URI> ouri = moduleReaderFor(mref).find(name);
                         if (ouri.isPresent()) {
                             try {
-                                return ouri.get().toURL();
+                                return ouri.getWhenPresent().toURL();
                             } catch (MalformedURLException e) { }
                         }
                         return null;