--- old/src/java.base/share/classes/java/util/ServiceLoader.java	2016-04-25 14:50:41.000000000 -0700
+++ new/src/java.base/share/classes/java/util/ServiceLoader.java	2016-04-25 14:50:41.000000000 -0700
@@ -600,7 +600,7 @@
                 if (descriptorIterator.hasNext()) {
                     ModuleDescriptor descriptor = descriptorIterator.next();
 
-                    nextModule = currentLayer.findModule(descriptor.name()).get();
+                    nextModule = currentLayer.findModule(descriptor.name()).getWhenPresent();
 
                     Provides provides = descriptor.provides().get(serviceName);
                     providersIterator = provides.providers().iterator();