--- old/src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java	2016-04-25 14:50:47.000000000 -0700
+++ new/src/java.base/share/classes/jdk/internal/logger/SimpleConsoleLogger.java	2016-04-25 14:50:47.000000000 -0700
@@ -192,7 +192,7 @@
     private String getCallerInfo() {
         Optional<StackWalker.StackFrame> frame = new CallerFinder().get();
         if (frame.isPresent()) {
-            return frame.get().getClassName() + " " + frame.get().getMethodName();
+            return frame.getWhenPresent().getClassName() + " " + frame.getWhenPresent().getMethodName();
         } else {
             return name;
         }