Error message tweaks, removal of unused line
Merge branch 'master' of https://github.com/fiebiga/compysition