--- old/src/java.base/share/classes/java/lang/module/ModuleReader.java	2016-04-25 14:50:31.000000000 -0700
+++ new/src/java.base/share/classes/java/lang/module/ModuleReader.java	2016-04-25 14:50:30.000000000 -0700
@@ -102,7 +102,7 @@
     default Optional<InputStream> open(String name) throws IOException {
         Optional<URI> ouri = find(name);
         if (ouri.isPresent()) {
-            return Optional.of(ouri.get().toURL().openStream());
+            return Optional.of(ouri.getWhenPresent().toURL().openStream());
         } else {
             return Optional.empty();
         }
@@ -144,7 +144,7 @@
     default Optional<ByteBuffer> read(String name) throws IOException {
         Optional<InputStream> in = open(name);
         if (in.isPresent()) {
-            byte[] bytes = in.get().readAllBytes();
+            byte[] bytes = in.getWhenPresent().readAllBytes();
             return Optional.of(ByteBuffer.wrap(bytes));
         } else {
             return Optional.empty();