Remove CLI fallback, fix client error.
Merge pull request #80 from Impromptu/cli-fallback

Remove CLI fallback, fix client error.