Index: generic/nsf.c
===================================================================
diff -u -r2f6bcca3537584c8ef1f9fc71b230e79d1560504 -r625a3e7b5660331938ab739fb28eda3d5540e189
--- generic/nsf.c	(.../nsf.c)	(revision 2f6bcca3537584c8ef1f9fc71b230e79d1560504)
+++ generic/nsf.c	(.../nsf.c)	(revision 625a3e7b5660331938ab739fb28eda3d5540e189)
@@ -7199,15 +7199,15 @@
       MixinComputeDefined(interp, object);
     }
     if (object->flags & NSF_MIXIN_ORDER_DEFINED_AND_VALID) {
-      NsfCmdList *ml = object->mixinOrder;
+      NsfCmdList *ml;
 
-      while (ml) {
+      for (ml = object->mixinOrder; ml; ml = ml->nextPtr) {
 	NsfClass *mixin = NsfGetClassFromCmdPtr(ml->cmdPtr);
-	if (pattern) {
-	  if (!Tcl_StringMatch(ClassName(mixin), pattern)) continue;
+
+	if (pattern && !Tcl_StringMatch(ClassName(mixin), pattern)) {
+	  continue;
 	}
 	npl = NsfClassListAdd(npl, mixin, NULL);
-	ml = ml->nextPtr;
       }
     }
   }
@@ -22652,7 +22652,7 @@
   }
   
   if (!found) {
-    result = NsfPrintError(interp, "cget: cannot lookup parameter value for %s", nameString);
+    result = NsfPrintError(interp, "cget: unknown configure parameter %s", nameString);
     goto cget_exit;
   }