Make some errors nicer to read
Merge pull request #1113 from mfalesni/slight-polishing

Make some errors nicer to read