Improve errors wording

Tomasz Maczukin requested to merge improve-error-wording into master Mar 17, 2020