--- a/src/hotspot/share/prims/jvmtiTagMap.cpp	Wed Aug 14 11:14:54 2019 +0100
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp	Wed Aug 14 10:07:00 2019 -0400
@@ -520,7 +520,7 @@
       tag_map = new JvmtiTagMap(env);
     }
   } else {
-    CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
+    DEBUG_ONLY(Thread::current()->check_possible_safepoint());
   }
   return tag_map;
 }