Index: generic/nsf.c
===================================================================
diff -u -N -r832cbcc5cb6d976f3d0849d67ac70c1eed7bac4c -re791865c0d6d854df515e7e0184e0d1d7b347c98
--- generic/nsf.c	(.../nsf.c)	(revision 832cbcc5cb6d976f3d0849d67ac70c1eed7bac4c)
+++ generic/nsf.c	(.../nsf.c)	(revision e791865c0d6d854df515e7e0184e0d1d7b347c98)
@@ -30039,6 +30039,7 @@
                             &nobjc, &nobjv, &freeArgumentVector);
   if (likely(result == TCL_OK)) {
     assert(cscPtr != NULL);
+    assert(methodName != NULL);
     result = NextSearchAndInvoke(interp, methodName, nobjc, nobjv, cscPtr, freeArgumentVector);
   }
   return result;
@@ -31127,8 +31128,8 @@
   case CurrentoptionNextmethodIdx: {
     Tcl_Obj *methodHandle;
 
-    cscPtr = CallStackGetTopFrame(interp, &framePtr);
-    assert(cscPtr != NULL);
+    /* cscPtr = */ (void) CallStackGetTopFrame(interp, &framePtr);
+    /*assert(cscPtr != NULL);*/
 
     methodHandle = FindNextMethod(interp, framePtr);
     if (methodHandle == NULL) {
@@ -32045,7 +32046,10 @@
       if (unlikely(varObj == NULL)) {
         Tcl_Obj *paramDefsObj = NsfParamDefsSyntax(interp, paramDefs->paramsPtr, object, NULL);
 
-        NsfPrintError(interp, "required argument '%s' is missing, should be:\n        %s%s%s %s", (paramPtr->nameObj != NULL) ? ObjStr(paramPtr->nameObj) : paramPtr->name, (pc.object != NULL) ? ObjectName(pc.object) : "", (pc.object != NULL) ? " " : "",
+        NsfPrintError(interp, "required argument '%s' is missing, should be:\n        %s%s%s %s",
+                      (paramPtr->nameObj != NULL) ? ObjStr(paramPtr->nameObj) : paramPtr->name,
+                      (pc.object != NULL) ? ObjectName(pc.object) : "",
+                      (pc.object != NULL) ? " " : "",
                       ObjStr(pc.full_objv[0]),
                       ObjStr(paramDefsObj));
         DECR_REF_COUNT2("paramDefsObj", paramDefsObj);
@@ -32119,11 +32123,11 @@
           if (varObj == NULL) {
             /*
              * The variable is not set. Therefore, we assume, we have to
-             * execute the initcmd. On success, we note the execution in the NSF_ARRAY_INITCMD
-             * variable (usually __initcmd(name))
+             * execute the initcmd. On success, we note the execution in the
+             * NSF_ARRAY_INITCMD variable (usually __initcmd(name))
              */
             result = ParameterMethodDispatch(interp, object, paramPtr, paramPtr->defaultValue,
-                                             uplevelVarFramePtr, initString,
+                                             uplevelVarFramePtr, ObjStr(paramPtr->defaultValue) /*initString*/,
                                              (Tcl_Obj **)&objv[pc.lastObjc],
                                              objc - pc.lastObjc);