--- old/src/java.base/share/classes/java/lang/module/Resolver.java	2016-04-25 14:50:32.000000000 -0700
+++ new/src/java.base/share/classes/java/lang/module/Resolver.java	2016-04-25 14:50:32.000000000 -0700
@@ -98,7 +98,7 @@
             if (TRACE) {
                 trace("Root module %s located", root);
                 if (mref.location().isPresent())
-                    trace("  (%s)", mref.location().get());
+                    trace("  (%s)", mref.location().getWhenPresent());
             }
 
             assert mref.descriptor().name().equals(root);
@@ -157,7 +157,7 @@
                         trace("Module %s located, required by %s",
                                 dn, descriptor.name());
                         if (mref.location().isPresent())
-                            trace("  (%s)", mref.location().get());
+                            trace("  (%s)", mref.location().getWhenPresent());
                     }
                 }
 
@@ -232,7 +232,7 @@
                                     if (!nameToReference.containsKey(pn)) {
 
                                         if (TRACE && mref.location().isPresent())
-                                            trace("  (%s)", mref.location().get());
+                                            trace("  (%s)", mref.location().getWhenPresent());
 
                                         nameToReference.put(pn, mref);
                                         q.push(provider);
@@ -434,7 +434,7 @@
             Optional<Hasher.DependencyHashes> ohashes = descriptor.hashes();
             if (!ohashes.isPresent())
                 continue;
-            Hasher.DependencyHashes hashes = ohashes.get();
+            Hasher.DependencyHashes hashes = ohashes.getWhenPresent();
 
             // check dependences
             for (ModuleDescriptor.Requires d : descriptor.requires()) {