--- old/src/hotspot/share/runtime/deoptimization.cpp	2018-03-01 09:52:01.667232998 +0100
+++ new/src/hotspot/share/runtime/deoptimization.cpp	2018-03-01 09:52:01.427233001 +0100
@@ -56,6 +56,7 @@
 #include "runtime/vframeArray.hpp"
 #include "runtime/vframe_hp.hpp"
 #include "utilities/events.hpp"
+#include "utilities/preserveException.hpp"
 #include "utilities/xmlstream.hpp"
 
 #if INCLUDE_JVMCI
@@ -648,6 +649,8 @@
 #ifndef PRODUCT
   if (VerifyStack) {
     ResourceMark res_mark;
+    // Clear pending exception to not break verification code (restored afterwards)
+    PRESERVE_EXCEPTION_MARK;
 
     thread->validate_frame_layout();