--- a/src/hotspot/share/prims/jvmtiExport.cpp	Mon Jun 04 08:56:41 2018 -0700
+++ b/src/hotspot/share/prims/jvmtiExport.cpp	Mon Jun 04 10:25:44 2018 -0700
@@ -1576,9 +1576,9 @@
     }
   }
 
-  if (state->is_enabled(JVMTI_EVENT_FRAME_POP)) {
-    JvmtiEnvThreadStateIterator it(state);
-    for (JvmtiEnvThreadState* ets = it.first(); ets != NULL; ets = it.next(ets)) {
+  JvmtiEnvThreadStateIterator it(state);
+  for (JvmtiEnvThreadState* ets = it.first(); ets != NULL; ets = it.next(ets)) {
+    if (ets->has_frame_pops()) {
       int cur_frame_number = state->cur_stack_depth();
 
       if (ets->is_frame_pop(cur_frame_number)) {