--- old/src/java.base/share/classes/java/lang/System.java	2017-03-20 11:58:08.000000000 +0000
+++ new/src/java.base/share/classes/java/lang/System.java	2017-03-20 11:58:08.000000000 +0000
@@ -1579,6 +1579,9 @@
      * @return an instance of {@link Logger} that can be used by the calling
      *         class.
      * @throws NullPointerException if {@code name} is {@code null}.
+     * @throws IllegalCallerException if there is no caller frame, i.e.
+     *         when this {@code getLogger} method is called from JNI
+     *         and there is no Java frame on the stack.
      *
      * @since 9
      */
@@ -1586,6 +1589,9 @@
     public static Logger getLogger(String name) {
         Objects.requireNonNull(name);
         final Class<?> caller = Reflection.getCallerClass();
+        if (caller == null) {
+            throw new IllegalCallerException("no caller frame");
+        }
         return LazyLoggers.getLogger(name, caller.getModule());
     }
 
@@ -1619,7 +1625,10 @@
      * resource bundle for message localization.
      * @throws NullPointerException if {@code name} is {@code null} or
      *         {@code bundle} is {@code null}.
-     *
+     * @throws IllegalCallerException if there is no caller frame, i.e.
+     *         when this {@code getLogger} method is called from JNI
+     *         and there is no Java frame on the stack.
+     * 
      * @since 9
      */
     @CallerSensitive
@@ -1627,6 +1636,9 @@
         final ResourceBundle rb = Objects.requireNonNull(bundle);
         Objects.requireNonNull(name);
         final Class<?> caller = Reflection.getCallerClass();
+        if (caller == null) {
+            throw new IllegalCallerException("no caller frame");
+        }
         final SecurityManager sm = System.getSecurityManager();
         // We don't use LazyLoggers if a resource bundle is specified.
         // Bootstrap sensitive classes in the JDK do not use resource bundles