Index: generic/gentclAPI.tcl
===================================================================
diff -u -rc5f2227387dec2a5c0af9b36dc1ebc8578d6603e -r0e247f618346f3d25ffe2c30633bf75bc1f67055
--- generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision c5f2227387dec2a5c0af9b36dc1ebc8578d6603e)
+++ generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 0e247f618346f3d25ffe2c30633bf75bc1f67055)
@@ -156,17 +156,15 @@
       set argNum 3
       append intro \
           "  NsfClass *cl =  NsfObjectToClass(clientData);" \n\n \
-          "  assert(objc > 0);" \n \
-          "  if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, \"class\", ObjStr(objv\[0\]));"
+          "  assert(objc > 0);" \n
     }
     object {
       set a  [list obj]
       set if [list "NsfObject *obj"]
       set argNum 3
       append intro \
           "  NsfObject *obj =  (NsfObject *)clientData;" \n\n \
-          "  assert(objc > 0);" \n \
-          "  if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, \"object\",  ObjStr(objv\[0\]));"
+          "  assert(objc > 0);" \n
     }
     ""    {
       append intro "  (void)clientData;\n"