Index: generic/nsf.c
===================================================================
diff -u -r694080e132828bfb8ca2d232cd0a75e436035459 -r3adc7fb2f78db5aa79f1d662cb799ddc86fc5793
--- generic/nsf.c	(.../nsf.c)	(revision 694080e132828bfb8ca2d232cd0a75e436035459)
+++ generic/nsf.c	(.../nsf.c)	(revision 3adc7fb2f78db5aa79f1d662cb799ddc86fc5793)
@@ -12252,7 +12252,7 @@
   /*
    * evaluate user-defined exit handler
    */
-  result = Tcl_Eval(interp, "::nsf::__exitHandler");
+  result = Tcl_Eval(interp, "::nsf::__exithandler");
 
   if (result != TCL_OK) {
     fprintf(stderr, "User defined exit handler contains errors!\n"
Index: generic/predefined.h
===================================================================
diff -u -re2f11549ef70518cca8c9c49b1d78f4383b00a87 -r3adc7fb2f78db5aa79f1d662cb799ddc86fc5793
--- generic/predefined.h	(.../predefined.h)	(revision e2f11549ef70518cca8c9c49b1d78f4383b00a87)
+++ generic/predefined.h	(.../predefined.h)	(revision 3adc7fb2f78db5aa79f1d662cb799ddc86fc5793)
@@ -30,12 +30,12 @@
 "regsub {\\\"} $msg \"\\\"info \" msg\n"
 "error $msg \"\"}\n"
 "proc ::nsf::exithandler {args} {\n"
-"lassign $args up value\n"
-"switch {$op} {\n"
+"lassign $args op value\n"
+"switch $op {\n"
 "set {::proc ::nsf::__exithandler {} $value}\n"
 "get {::info body ::nsf::__exithandler}\n"
-"unset {::proc ::nsf::__exithandler {} {;}}\n"
-"default {puts \"syntax: ::nsf::exithandler set|get|unset ?arg?\"}}}\n"
+"unset {proc ::nsf::__exithandler args {;}}\n"
+"default {error \"syntax: ::nsf::exithandler set|get|unset ?arg?\"}}}\n"
 "::nsf::exithandler unset\n"
 "proc tmpdir {} {\n"
 "foreach e [list TMPDIR TEMP TMP] {\n"
Index: generic/predefined.tcl
===================================================================
diff -u -re2f11549ef70518cca8c9c49b1d78f4383b00a87 -r3adc7fb2f78db5aa79f1d662cb799ddc86fc5793
--- generic/predefined.tcl	(.../predefined.tcl)	(revision e2f11549ef70518cca8c9c49b1d78f4383b00a87)
+++ generic/predefined.tcl	(.../predefined.tcl)	(revision 3adc7fb2f78db5aa79f1d662cb799ddc86fc5793)
@@ -76,12 +76,12 @@
   # exit handlers
   #
   proc ::nsf::exithandler {args} {
-    lassign $args up value
-    switch {$op} {
+    lassign $args op value
+    switch $op {
       set {::proc ::nsf::__exithandler {} $value}
       get {::info body ::nsf::__exithandler}
-      unset {::proc ::nsf::__exithandler {} {;}}
-      default {puts "syntax: ::nsf::exithandler set|get|unset ?arg?"}
+      unset {proc ::nsf::__exithandler args {;}}
+      default {error "syntax: ::nsf::exithandler set|get|unset ?arg?"}
     }
   }
   # initialize exit handler