Change client to produce a better error message.
Improve error message.