--- a/jdk/src/java.base/share/classes/java/security/KeyStoreSpi.java	Tue Aug 18 20:30:15 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/security/KeyStoreSpi.java	Wed Aug 19 17:42:52 2015 +0100
@@ -618,9 +618,12 @@
      * @throws IOException if there is an I/O problem with the keystore data.
      * @throws NullPointerException if stream is {@code null}.
      *
-     * @since 1.9
+     * @since 9
      */
     public boolean engineProbe(InputStream stream) throws IOException {
+        if (stream == null) {
+            throw new NullPointerException("input stream must not be null");
+        }
         return false;
     }
 }