Error message consistency

Erick Hitter requested to merge fix/error-consistency into master

Merge request reports