Exit after running --client
Merge pull request #1566 from edwinb/client-fix

Exit after running --client