Index: generic/nsf.c
===================================================================
diff -u -r83d91f91876713c330b09b8af651b4bb4c52871f -rd32646c841203960a376e05e07db1edc556304a7
--- generic/nsf.c	(.../nsf.c)	(revision 83d91f91876713c330b09b8af651b4bb4c52871f)
+++ generic/nsf.c	(.../nsf.c)	(revision d32646c841203960a376e05e07db1edc556304a7)
@@ -9480,6 +9480,9 @@
   if (startClass->opt != NULL) {
     NsfCmdList *m;
 
+    /*
+     * Check whether startCl has associated per-class mixins.
+     */
     for (m = startClass->opt->isClassMixinOf; m != NULL; m = m->nextPtr) {
       NsfClass *class;
 
@@ -9500,14 +9503,10 @@
         return done;
       }
     }
-  }
 
-  /*
-   * Check whether startCl has associated per-object mixins.
-   */
-  if (startClass->opt != NULL) {
-    NsfCmdList *m;
-
+    /*
+     * Check whether startCl has associated per-object mixins.
+     */
     for (m = startClass->opt->isObjectMixinOf; m != NULL; m = m->nextPtr) {
       NsfObject *object;