--- old/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java	2016-04-18 10:43:38.595423505 -0700
+++ new/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java	2016-04-18 10:43:38.304424758 -0700
@@ -101,10 +101,10 @@
     @Override
     public FileSystem newFileSystem(URI uri, Map<String, ?> env)
             throws IOException {
+        Objects.requireNonNull(env);
         checkPermission();
         checkUri(uri);
-
-        if (env != null && env.containsKey("java.home")) {
+        if (env.containsKey("java.home")) {
             return newFileSystem((String)env.get("java.home"), uri, env);
         } else {
             return new JrtFileSystem(this, env);