diff --git a/src/thread.cc b/src/thread.cc
index f15bfd5..ce81a8b 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -1734,8 +1734,8 @@
 }
 
 void Thread::VerifyStack() {
-  Context* context = GetLongJumpContext();
-  ReferenceMapVisitor mapper(context, VerifyObject, NULL);
+  UniquePtr<Context> context(Context::Create());
+  ReferenceMapVisitor mapper(context.get(), VerifyObject, NULL);
   WalkStack(&mapper);
 }
 #endif