--- old/src/hotspot/share/interpreter/linkResolver.cpp	2017-10-26 03:06:53.147037944 -0400
+++ new/src/hotspot/share/interpreter/linkResolver.cpp	2017-10-26 03:06:51.538946072 -0400
@@ -572,6 +572,10 @@
                                        sel_klass,
                                        flags,
                                        true)) {
+    // Propagate any existing exceptions that may have been thrown
+    if (HAS_PENDING_EXCEPTION) {
+      return;
+    }
     ResourceMark rm(THREAD);
     Exceptions::fthrow(
       THREAD_AND_LOCATION,
@@ -919,6 +923,11 @@
                                        sel_klass,
                                        fd.access_flags(),
                                        true)) {
+    // Propagate any existing exceptions that may have been thrown
+    if (HAS_PENDING_EXCEPTION) {
+      return;
+    }
+
     ResourceMark rm(THREAD);
     Exceptions::fthrow(
       THREAD_AND_LOCATION,