--- old/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	2015-11-19 00:59:47.764576639 -0500
+++ new/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	2015-11-19 00:59:45.736462519 -0500
@@ -134,7 +134,7 @@
                         int abort_if_unrecognized) {
   ucontext_t* uc = (ucontext_t*) ucVoid;
 
-  Thread* t = ThreadLocalStorage::get_thread_slow();
+  Thread* t = Thread::current_or_null_safe();
 
   SignalHandlerMark shm(t);