Merge 0.1.x (cli exception fixes)
Merge pull request #94 from cprice404/maint/master/merge-0.1.x-cli-exception-changes

Merge 0.1.x (cli exception fixes)