--- old/src/java.base/share/classes/java/util/AbstractList.java	2020-01-08 12:41:19.302219737 +0000
+++ new/src/java.base/share/classes/java/util/AbstractList.java	2020-01-08 12:41:19.030206258 +0000
@@ -374,7 +374,7 @@
                 return next;
             } catch (IndexOutOfBoundsException e) {
                 checkForComodification();
-                throw new NoSuchElementException();
+                throw new NoSuchElementException(e);
             }
         }
 
@@ -418,7 +418,7 @@
                 return previous;
             } catch (IndexOutOfBoundsException e) {
                 checkForComodification();
-                throw new NoSuchElementException();
+                throw new NoSuchElementException(e);
             }
         }
 
--- old/src/java.base/share/classes/java/util/NoSuchElementException.java	2020-01-08 12:41:19.930250858 +0000
+++ new/src/java.base/share/classes/java/util/NoSuchElementException.java	2020-01-08 12:41:19.658237379 +0000
@@ -56,4 +56,31 @@
     public NoSuchElementException(String s) {
         super(s);
     }
+
+    /**
+     * Constructs a {@code NoSuchElementException} with the specified detail
+     * message and cause.
+     *
+     * @param s     the detail message, or null
+     * @param cause the cause (which is saved for later retrieval by the
+     *              {@link #getCause()} method), or null
+     * @since 15
+     */
+    public NoSuchElementException(String s, Throwable cause) {
+        super(s, cause);
+    }
+
+    /**
+     * Constructs a {@code NoSuchElementException} with the specified cause.
+     * The detail message is set to {@code (cause == null ? null :
+     * cause.toString())} (which typically contains the class and
+     * detail message of {@code cause}).
+     *
+     * @param cause the cause (which is saved for later retrieval by the
+     *              {@link #getCause()} method)
+     * @since 15
+     */
+    public NoSuchElementException(Throwable cause) {
+        super(cause);
+    }
 }
--- /dev/null	2019-12-27 12:58:23.874685741 +0000
+++ new/test/jdk/java/util/AbstractList/CheckForIndexOutOfBoundsException.java	2020-01-08 12:41:20.298269095 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2019, 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     8161558
+ * @summary ListIterator should not discard cause on exception
+ * @run testng CheckForIndexOutOfBoundsException
+ */
+
+import java.util.List;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+@Test
+public class CheckForIndexOutOfBoundsException {
+
+    List<String> list = Collections.nCopies(2, "x");
+
+    @Test
+    public void checkNext() {
+        var iterator = list.listIterator(list.size());; // position at end
+        try {
+            iterator.next();
+            fail("Failing checkNext Test - NoSuchElementException should have been thrown");
+        } catch (NoSuchElementException e) {
+            var cause = e.getCause();
+            assertNotNull(cause, "CheckNext Exception.getCause()");
+            assertTrue(cause instanceof IndexOutOfBoundsException, "CheckNext Exception.getCause() should be an IndexOutOfBoundsException");
+            var msg = e.getMessage();
+            assertNotNull(msg, "CheckNext Exception.getMessage()");
+            assertTrue(msg.contains("IndexOutOfBoundsException"), "CheckNext Exception.getMessage() should contain the string 'IndexOutOfBoundsException'");
+        }
+    }
+
+    @Test
+    public void checkPrevious() {
+        var iterator = list.listIterator(0); // position at start
+        try {
+            iterator.previous();
+            fail("Failing checkPrevious Test - NoSuchElementException should have been thrown");
+        } catch (NoSuchElementException e) {
+            var cause = e.getCause();
+            assertNotNull(cause, "CheckPrevious Exception.getCause()");
+            assertTrue(cause instanceof IndexOutOfBoundsException, "CheckPrevious Exception.getCause() should be an IndexOutOfBoundsException");
+            var msg = e.getMessage();
+            assertNotNull(msg, "CheckPrevious Exception.getMessage()");
+            assertTrue(msg.contains("IndexOutOfBoundsException"), "CheckPrevious Exception.getMessage() should contain the string 'IndexOutOfBoundsException'");
+        }
+    }
+}