Index: generic/nsf.c
===================================================================
diff -u -r33aa1b2385ae4e763ecc518178ad112a729423dc -rbd4d7d05236089179f0ecfd10b5fc23c7af86e9f
--- generic/nsf.c	(.../nsf.c)	(revision 33aa1b2385ae4e763ecc518178ad112a729423dc)
+++ generic/nsf.c	(.../nsf.c)	(revision bd4d7d05236089179f0ecfd10b5fc23c7af86e9f)
@@ -9844,8 +9844,7 @@
 
     assert(subClasses->cl);
 
-    hPtr = &subClasses->cl->instances ?
-      Tcl_FirstHashEntry(&subClasses->cl->instances, &hSrch) : NULL;
+    hPtr = Tcl_FirstHashEntry(&subClasses->cl->instances, &hSrch);
 
     /* recalculate the commands of all class-filter registrations */
     if (subClasses->cl->opt != NULL) {
@@ -9904,7 +9903,7 @@
     NsfClassOpt *opt;
 
     assert(subClasses->cl);
-    hPtr = &subClasses->cl->instances ? Tcl_FirstHashEntry(&subClasses->cl->instances, &hSrch) : NULL;
+    hPtr = Tcl_FirstHashEntry(&subClasses->cl->instances, &hSrch);
 
     opt = subClasses->cl->opt;
     if (opt != NULL) {