fixing a bug introduced by last commit
Merge pull request #436 from mconf/improving-client-checks

Client check - fixing a bug introduced by last commit