Index: generic/nsf.c
===================================================================
diff -u -r19ef72a5f87241def42fa2a2ec15e28a8717b59b -rb14118b7068e3c1e903b9a516eef0c86101b24d9
--- generic/nsf.c	(.../nsf.c)	(revision 19ef72a5f87241def42fa2a2ec15e28a8717b59b)
+++ generic/nsf.c	(.../nsf.c)	(revision b14118b7068e3c1e903b9a516eef0c86101b24d9)
@@ -7475,7 +7475,7 @@
     result = ObjectDispatchFinalize(interp, cscPtr, result /*, "NRE" , methodName*/);
 #endif
 
-    CscFinish(interp, cscPtr, "scripted finalize");
+    CscFinish(interp, cscPtr, result, "scripted finalize");
   }
 
   return result;
@@ -7562,7 +7562,7 @@
 	 */
 #if defined(NRE)
 	//CscListRemove(interp, cscPtr);
-	CscFinish(interp, cscPtr, "guard failed");
+	CscFinish(interp, cscPtr, result, "guard failed");
 #endif
 	return result;
       }
@@ -7641,7 +7641,7 @@
 #endif
   } else /* result != OK */ {
 #if defined(NRE)
-    CscFinish(interp, cscPtr, "nre, prep failed");
+    CscFinish(interp, cscPtr, result, "nre, prep failed");
 #endif
   }
 
@@ -7977,11 +7977,11 @@
 #if defined(NRE)
   if ((cscPtr->flags & NSF_CSC_CALL_IS_NRE) == 0) {
     CscListRemove(interp, cscPtr);
-    CscFinish(interp, cscPtr, "csc cleanup");
+    CscFinish(interp, cscPtr, result, "csc cleanup");
   }
 #else
   CscListRemove(interp, cscPtr);
-  CscFinish(interp, cscPtr, "csc cleanup");
+  CscFinish(interp, cscPtr, result, "csc cleanup");
 #endif
 
   return result;
@@ -8340,7 +8340,7 @@
   if (!(cscPtr->flags & NSF_CSC_CALL_IS_NRE)) {
     result = ObjectDispatchFinalize(interp, cscPtr, result /*, "immediate" , methodName*/);
     CscListRemove(interp, cscPtr);
-    CscFinish(interp, cscPtr, "non-scripted finalize");
+    CscFinish(interp, cscPtr, result, "non-scripted finalize");
   }
 
   /*fprintf(stderr, "ObjectDispatch %s.%s returns %d\n",
@@ -16899,7 +16899,7 @@
        */
       Nsf_PopFrameCsc(interp, framePtr2);
       CscListRemove(interp, cscPtr);
-      CscFinish(interp, cscPtr, "converter object frame");
+      CscFinish(interp, cscPtr, result, "converter object frame");
       Tcl_Interp_varFramePtr(interp) = varFramePtr;
 
       /*fprintf(stderr, "NsfOConfigureMethod_ attribute %s evaluated %s => (%d)\n",