--- a/hotspot/src/share/vm/prims/stackwalk.cpp	Thu Sep 22 16:41:01 2016 +0200
+++ b/hotspot/src/share/vm/prims/stackwalk.cpp	Thu Sep 22 10:24:25 2016 -0700
@@ -331,10 +331,12 @@
     assert (use_frames_array(mode), "Bad mode for get live frame");
     RegisterMap regMap(jt, true);
     LiveFrameStream stream(jt, &regMap);
-    return fetchFirstBatch(stream, stackStream, mode, skip_frames, frame_count, start_index, frames_array, CHECK_NULL);
+    return fetchFirstBatch(stream, stackStream, mode, skip_frames, frame_count,
+                           start_index, frames_array, THREAD);
   } else {
     JavaFrameStream stream(jt, mode);
-    return fetchFirstBatch(stream, stackStream, mode, skip_frames, frame_count, start_index, frames_array, CHECK_NULL);
+    return fetchFirstBatch(stream, stackStream, mode, skip_frames, frame_count,
+                           start_index, frames_array, THREAD);
   }
 }