Fix CLI Exception messages
Merge branch 'develop' into feature/easyplugin