Index: generic/nsf.c
===================================================================
diff -u -N -r3c3c372bf8a0c3ff6e69b03b5ede42ed41460bfd -r727ef73da2e722dffa8cd8d7d5778df774d41ec9
--- generic/nsf.c	(.../nsf.c)	(revision 3c3c372bf8a0c3ff6e69b03b5ede42ed41460bfd)
+++ generic/nsf.c	(.../nsf.c)	(revision 727ef73da2e722dffa8cd8d7d5778df774d41ec9)
@@ -29315,7 +29315,6 @@
     /*
      * If a value is provided, return the error below.
      */
-    break;
   case ObjectpropertyRootclassIdx: flags = NSF_IS_ROOT_CLASS; break;
   case ObjectpropertySlotcontainerIdx: flags = NSF_IS_SLOT_CONTAINER; allowSet = 1; break;
   case ObjectpropertyKeepcallerselfIdx: flags = NSF_KEEP_CALLER_SELF; allowSet = 1; break;
@@ -32779,7 +32778,6 @@
    */
   if (unlikely(NSValidObjectName(nameString, (size_t)nameLength) == 0)) {
     result = NsfPrintError(interp, "cannot allocate object - illegal name '%s'", nameString);
-    autoNameCreate = NSF_FALSE;
     goto create_method_exit;
   }
 
@@ -34968,7 +34966,7 @@
      */
     for (entry = *instances, lastEntry = NULL;
          entry != NULL;
-         lastEntry = entry, entry = entry->nextPtr) {
+         lastEntry = entry, entry = ((entry != NULL) ? entry->nextPtr : NULL)) {
       NsfClass *class = entry->clorobj;
 
       assert(class != NULL);