Add some checks to the client script methods
Merge branch 'hotfix/1.1.1'