--- old/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp	2016-08-19 12:32:33.070550468 +0200
+++ new/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp	2016-08-19 12:32:32.958547961 +0200
@@ -1169,6 +1169,11 @@
   // reset_last_Java_frame
   __ reset_last_Java_frame(thread, true, true);
 
+  if (CheckJNICalls) {
+    // clear_pending_jni_exception_check
+    __ movptr(Address(thread, JavaThread::pending_jni_exception_check_fn_offset()), NULL_WORD);
+  }
+
   // reset handle block
   __ movptr(t, Address(thread, JavaThread::active_handles_offset()));
   __ movl(Address(t, JNIHandleBlock::top_offset_in_bytes()), (int32_t)NULL_WORD);