Index: generic/nsf.c
===================================================================
diff -u -rf34ac86da9500e115e9bbd5e638b055d64896925 -ra6e6626742e484bf5d7d8052689760bb713c8693
--- generic/nsf.c	(.../nsf.c)	(revision f34ac86da9500e115e9bbd5e638b055d64896925)
+++ generic/nsf.c	(.../nsf.c)	(revision a6e6626742e484bf5d7d8052689760bb713c8693)
@@ -16722,7 +16722,7 @@
   if (tcd->objframe) {
     Nsf_PopFrameObj(interp, framePtr);
   }
-  if (unlikely(result == TCL_ERROR && tcd && tcd->onerror)) {
+  if (unlikely(result == TCL_ERROR && tcd->onerror)) {
     Tcl_Obj *ov[2];
     ov[0] = tcd->onerror;
     ov[1] = Tcl_GetObjResult(interp);
@@ -18907,7 +18907,7 @@
 	  Tcl_DString ds, *dsPtr = &ds;
 	  Tcl_HashTable *cmdTablePtr = childObject->nsPtr ? Tcl_Namespace_cmdTablePtr(childObject->nsPtr) : NULL;
 	
-	  if (cmdTablePtr == NULL || childObject == NULL) {
+	  if (cmdTablePtr == NULL) {
 	    /* nothing to do */
 	    continue;
 	  }	
Index: generic/nsfInt.h
===================================================================
diff -u -r7401c1c91b67a9adc5b3c1a9049a37a9d8e13c93 -ra6e6626742e484bf5d7d8052689760bb713c8693
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 7401c1c91b67a9adc5b3c1a9049a37a9d8e13c93)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision a6e6626742e484bf5d7d8052689760bb713c8693)
@@ -263,7 +263,7 @@
   /*fprintf(stderr, "c '%s'\n", ObjStr(A));*/				\
   MEM_COUNT_ALLOC("INCR_REF_COUNT-" name,A); Tcl_IncrRefCount(A)
 
-#define ObjStr(obj) (obj)->bytes ? (obj)->bytes : Tcl_GetString(obj)
+#define ObjStr(obj) ((obj)->bytes) ? ((obj)->bytes) : Tcl_GetString(obj)
 #define ClassName(cl) (((cl) ? ObjStr((cl)->object.cmdName) : "NULL"))
 #define ObjectName(obj) (((obj) ? ObjStr((obj)->cmdName) : "NULL"))