Index: generic/nsf.c
===================================================================
diff -u -ref171ec38307380a4c1c3e29e301dcbb47b9f01f -re734f275fee0b570e77fe2813c93d315273cb1c0
--- generic/nsf.c	(.../nsf.c)	(revision ef171ec38307380a4c1c3e29e301dcbb47b9f01f)
+++ generic/nsf.c	(.../nsf.c)	(revision e734f275fee0b570e77fe2813c93d315273cb1c0)
@@ -3412,7 +3412,7 @@
    */
   for (hPtr = Tcl_FirstHashEntry(cmdTablePtr, &hSrch); hPtr;
        hPtr = Tcl_NextHashEntry(&hSrch)) {
-    if (hPtr->tablePtr) {
+    if (cmdTablePtr->numEntries) {
       NSDeleteChild(interp, (Tcl_Command)Tcl_GetHashValue(hPtr), 0);
     } else {
       break;