--- old/src/java.base/share/classes/jdk/internal/jrtfs/AbstractJrtFileSystem.java	Tue Mar  8 21:59:12 2016
+++ new/src/java.base/share/classes/jdk/internal/jrtfs/AbstractJrtFileSystem.java	Tue Mar  8 21:59:12 2016
@@ -102,7 +102,7 @@
                 if (lo == LinkOption.NOFOLLOW_LINKS) {
                     return false;
                 } else if (lo == null) {
-                    throw new NullPointerException();
+                    throw new NullPointerException("LinkOption");
                 } else {
                     throw new AssertionError("should not reach here");
                 }
@@ -116,10 +116,11 @@
         // check for options of null type and option is an intance of StandardOpenOption
         for (OpenOption option : options) {
             if (option == null) {
-                throw new NullPointerException();
+                throw new NullPointerException("OpenOption");
             }
             if (!(option instanceof StandardOpenOption)) {
-                throw new IllegalArgumentException();
+                throw new IllegalArgumentException(
+                   "option class : " + option.getClass().getName());
             }
         }
 
@@ -211,7 +212,7 @@
     public PathMatcher getPathMatcher(String syntaxAndInput) {
         int pos = syntaxAndInput.indexOf(':');
         if (pos <= 0 || pos == syntaxAndInput.length()) {
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("pos is " + pos);
         }
         String syntax = syntaxAndInput.substring(0, pos);
         String input = syntaxAndInput.substring(pos + 1);