diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixException.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixException.java
index 22a41ebccc4..540578d8251 100644
--- a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixException.java
+++ b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -70,6 +70,12 @@ class UnixException extends Exception {
         return errorString();
     }
 
+    @Override
+    public Throwable fillInStackTrace() {
+        // This is an internal exception; the stack trace is irrelevant.
+        return this;
+    }
+
     /**
      * Map well known errors to specific exceptions where possible; otherwise
      * return more general FileSystemException.
diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsException.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsException.java
index 17e0fd258d7..1312d5a0938 100644
--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsException.java
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -69,6 +69,12 @@ class WindowsException extends Exception {
         return errorString();
     }
 
+    @Override
+    public Throwable fillInStackTrace() {
+        // This is an internal exception; the stack trace is irrelevant.
+        return this;
+    }
+
     private IOException translateToIOException(String file, String other) {
         // not created with last error
         if (lastError() == 0)