Fixing error messages for clients