--- old/src/java.base/share/classes/java/lang/module/ModuleFinder.java	2016-04-25 14:50:27.000000000 -0700
+++ new/src/java.base/share/classes/java/lang/module/ModuleFinder.java	2016-04-25 14:50:27.000000000 -0700
@@ -329,7 +329,7 @@
                                        .map(a -> a.descriptor().name())
                                        .distinct()
                                        .map(this::find)
-                                       .map(Optional::get)
+                                       .map(Optional::getWhenPresent)
                                        .collect(Collectors.toSet());
                 }
                 return allModules;