Index: generic/nsf.c
===================================================================
diff -u -r9f51576de17e47b9495ae7ceea1340bc8d200507 -r17b63f15e327dd62f8dcd5e5419b7096b7d858ce
--- generic/nsf.c	(.../nsf.c)	(revision 9f51576de17e47b9495ae7ceea1340bc8d200507)
+++ generic/nsf.c	(.../nsf.c)	(revision 17b63f15e327dd62f8dcd5e5419b7096b7d858ce)
@@ -14414,7 +14414,7 @@
 
     if (objc == 0 && ((pPtr->flags & NSF_ARG_ALLOW_EMPTY) == 0)) {
       return NsfPrintError(interp,
-			   "invalid parameter value for %s: list is not allowed to be empty",
+			   "invalid value for parameter '%s': list is not allowed to be empty",
 			   pPtr->name);
     }
 
Index: tests/disposition.test
===================================================================
diff -u -r4f092237cb67473c0364fb761340d62a3a774a1a -r17b63f15e327dd62f8dcd5e5419b7096b7d858ce
--- tests/disposition.test	(.../disposition.test)	(revision 4f092237cb67473c0364fb761340d62a3a774a1a)
+++ tests/disposition.test	(.../disposition.test)	(revision 17b63f15e327dd62f8dcd5e5419b7096b7d858ce)
@@ -356,7 +356,7 @@
   ? {[S new -foo [list 0 1]] eval {info exists :foo}} \
       "expected integer but got \"0 1\" for parameter \"x\""
   ? {[S new -foo [list]] eval {info exists :foo}} \
-      "invalid parameter value for -foo: list is not allowed to be empty"
+      "invalid value for parameter '-foo': list is not allowed to be empty"
   ? {[S new -foo 5] eval {info exists :foo}} 1
   ? {[S new -foo f] eval {info exists :foo}} \
       "invalid value in \"f\": expected integer but got \"f\" for parameter \"-foo\""
@@ -515,12 +515,10 @@
     }
     :public method foo {args} {
       set :foo $args
-      #puts stderr FOO
       return $args
     }
     :public method bar {args} {
       set :bar $args
-      #puts stderr BAR
       return $args
     }
   }
Index: tests/parameters.test
===================================================================
diff -u -r8cec7f90a2d5e046562c37c85c934137c4155860 -r17b63f15e327dd62f8dcd5e5419b7096b7d858ce
--- tests/parameters.test	(.../parameters.test)	(revision 8cec7f90a2d5e046562c37c85c934137c4155860)
+++ tests/parameters.test	(.../parameters.test)	(revision 17b63f15e327dd62f8dcd5e5419b7096b7d858ce)
@@ -1079,7 +1079,7 @@
   o public method foo {x:integer,0..1 y:integer os:object,1..*} {return $x}
   ? {o foo 1 2 {o1 "" o2}} {invalid value in "o1 "" o2": expected object but got "" for parameter "os"} \
       "list contains empty value"
-  ? {o foo "" 2 {}} {invalid parameter value for os: list is not allowed to be empty} \
+  ? {o foo "" 2 {}} {invalid value for parameter 'os': list is not allowed to be empty} \
       "empty int, empty list of objects"
 }
 #######################################################