gistfile1.txt

diff --git a/src/core/frame.c b/src/core/frame.c
index 6965e6c65..c0f93d907 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -933,7 +933,7 @@ static MVMuint64 remove_one_frame(MVMThreadContext *tc, MVMuint8 unwind) {
         *(tc->interp_cu) = caller->static_info->body.cu;
 
         /* Handle any special return hooks. */
-        if (caller->extra) {
+        if (caller->extra && returner != tc->thread_entry_frame) {
             MVMFrameExtra *e = caller->extra;
             if (e->special_return || e->special_unwind) {
                 MVMSpecialReturn  sr  = e->special_return;