Improved error message and fixed output format.
Merge branch 'master' of github.com:seadsystem/Backend