Re-do the client error messages to be more descriptive