--- old/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java	2016-04-25 14:50:59.000000000 -0700
+++ new/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java	2016-04-25 14:50:59.000000000 -0700
@@ -242,7 +242,7 @@
         Map<String, Path> modPaths = new HashMap<>();
         for (ResolvedModule resolvedModule : cf.modules()) {
             ModuleReference mref = resolvedModule.reference();
-            URI uri = mref.location().get();
+            URI uri = mref.location().getWhenPresent();
             modPaths.put(mref.descriptor().name(), Paths.get(uri));
         }
         return modPaths;
@@ -406,7 +406,7 @@
         for (String mod : otherMods) {
             Optional<ModuleReference> omref = finder.find(mod);
             if (omref.isPresent()) {
-                ModuleReference mref = omref.get();
+                ModuleReference mref = omref.getWhenPresent();
                 map.putIfAbsent(mod, mref);
                 mrefs.add(mref);
             } else {