--- old/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java	2015-02-05 18:37:37.257183549 +0530
+++ new/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java	2015-02-05 18:37:37.089182718 +0530
@@ -60,6 +60,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -904,7 +905,7 @@
      * @throw SecurityException if not accessible
      */
     private static void checkPackageAccess(final SecurityManager sm, final String fullName) {
-        sm.getClass(); // null check
+        Objects.requireNonNull(sm);
         final int index = fullName.lastIndexOf('.');
         if (index != -1) {
             final String pkgName = fullName.substring(0, index);