--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java	Sat May 21 22:32:08 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java	Mon May 23 10:08:48 2016 +0530
@@ -1062,7 +1062,7 @@
                     return null;
                 }
 
-                if (p.getFileName().toString().endsWith(".jar")) {
+                if (p.getFileName().toString().endsWith(".jar") && fsInfo.exists(p)) {
                     try (FileSystem fs = FileSystems.newFileSystem(p, null)) {
                         Path moduleInfoClass = fs.getPath("module-info.class");
                         if (Files.exists(moduleInfoClass)) {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/modules/MissingJarInModulePathTest.java	Mon May 23 10:08:48 2016 +0530
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8154824
+ * @summary Compiler should handle java.nio.file.FileSystemNotFoundException gracefully and not abort
+ * @compile/fail/ref=MissingJarInModulePathTest.out -XDrawDiagnostics -Xlint:path -Werror -modulepath missing.jar MissingJarInModulePathTest.java
+ */
+
+class MissingJarInModulePathTest {}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/modules/MissingJarInModulePathTest.out	Mon May 23 10:08:48 2016 +0530
@@ -0,0 +1,4 @@
+- compiler.warn.path.element.not.found: missing.jar
+- compiler.err.warnings.and.werror
+1 error
+1 warning
\ No newline at end of file