Fix the case when the callback provided to the client is NULL.