fix create/del error handling