--- old/src/java.management/share/classes/java/lang/management/ManagementFactory.java	2016-04-25 14:50:55.000000000 -0700
+++ new/src/java.management/share/classes/java/lang/management/ManagementFactory.java	2016-04-25 14:50:55.000000000 -0700
@@ -943,7 +943,7 @@
                 .findFirst();
 
             if (op.isPresent()) {
-                return op.get();
+                return op.getWhenPresent();
             } else {
                 return null;
             }
@@ -966,7 +966,7 @@
                     }
                 });
 
-            PlatformComponent<?> singleton = op.isPresent() ? op.get() : null;
+            PlatformComponent<?> singleton = op.isPresent() ? op.getWhenPresent() : null;
             if (singleton == null) {
                 throw new IllegalArgumentException(mbeanIntf.getName() +
                     " is not a platform management interface");