Index: generic/nsfStack.c
===================================================================
diff -u -r6af35a888e33da976e283271bb68060f34d91a9a -r16324e94fee054ff57d403e5b51cf96117317ea0
--- generic/nsfStack.c	(.../nsfStack.c)	(revision 6af35a888e33da976e283271bb68060f34d91a9a)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision 16324e94fee054ff57d403e5b51cf96117317ea0)
@@ -502,17 +502,19 @@
 NSF_INLINE static NsfCallStackContent*
 CallStackGetTopFrame0(const Tcl_Interp *interp) {
   register Tcl_CallFrame *varFramePtr;
+  NsfCallStackContent    *result = NULL;
 
   nonnull_assert(interp != NULL);
 
   for (varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
        varFramePtr != NULL;
        varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) {
     if (likely(((unsigned int)Tcl_CallFrame_isProcCallFrame(varFramePtr) & (FRAME_IS_NSF_METHOD|FRAME_IS_NSF_CMETHOD)) != 0u)) {
-      return (NsfCallStackContent *)Tcl_CallFrame_clientData(varFramePtr);
+      result = (NsfCallStackContent *)Tcl_CallFrame_clientData(varFramePtr);
+      break;
     }
   }
-  return NULL;
+  return result;
 }
 
 #if defined(NSF_PROFILE)