ClientException does not need the client object
Removed redundant code
empty quote strings are valid