Improve sanity checking for client objects.