Tidy error messages
Restriction for client names