--- old/src/jdk.jartool/share/classes/sun/tools/jar/Main.java	2016-04-25 14:50:56.000000000 -0700
+++ new/src/jdk.jartool/share/classes/sun/tools/jar/Main.java	2016-04-25 14:50:56.000000000 -0700
@@ -1681,7 +1681,7 @@
 
         Optional<String> mc = md.mainClass();
         if (mc.isPresent())
-            sb.append("\nMain class:\n  " + mc.get());
+            sb.append("\nMain class:\n  " + mc.getWhenPresent());
 
         s = md.conceals();
         if (!s.isEmpty()) {
@@ -1696,7 +1696,7 @@
                     (Optional<Hasher.DependencyHashes>) m.invoke(md);
 
             if (optHashes.isPresent()) {
-                Hasher.DependencyHashes hashes = optHashes.get();
+                Hasher.DependencyHashes hashes = optHashes.getWhenPresent();
                 sb.append("\nHashes:");
                 sb.append("\n  Algorithm: " + hashes.algorithm());
                 hashes.names().stream().forEach(mod ->
@@ -1805,7 +1805,7 @@
                 if (!omref.isPresent()) {
                     throw new IOException(formatMsg2("error.hash.dep", name , dn));
                 }
-                map.put(dn, modRefToPath(omref.get()));
+                map.put(dn, modRefToPath(omref.getWhenPresent()));
             }
         }
 
@@ -1817,7 +1817,7 @@
     }
 
     private static Path modRefToPath(ModuleReference mref) {
-        URI location = mref.location().get();
+        URI location = mref.location().getWhenPresent();
         return Paths.get(location);
     }
 }