Index: generic/nsf.c
===================================================================
diff -u -N -ra757c1ae018c02c63352a3def444bf81673a555c -r2638eb962eec177de69d8ccd99876d4321d9e1fb
--- generic/nsf.c	(.../nsf.c)	(revision a757c1ae018c02c63352a3def444bf81673a555c)
+++ generic/nsf.c	(.../nsf.c)	(revision 2638eb962eec177de69d8ccd99876d4321d9e1fb)
@@ -30552,13 +30552,12 @@
       NsfClass *cl = entry->clorobj;
 
       assert(cl != NULL);
-      if (!NsfObjectIsClass(&cl->object)) {
+      if (cl == NULL || !NsfObjectIsClass(&cl->object)) {
         continue;
       }
 
       /*fprintf(stderr, "cl key = %s %p\n", ClassName(cl), cl); */
-      if (cl
-          && !ObjectHasChildren((NsfObject *)cl)
+      if (!ObjectHasChildren((NsfObject *)cl)
           && !ClassHasInstances(cl)
           && !ClassHasSubclasses(cl)
           && !IsBaseClass(&cl->object)