Error message improved

Merged Piotr Gawron requested to merge error-message into master

Merge request reports