Merge branch 'fix/error-consistency' into 'master'

Error message consistency

See merge request !3
7 jobs for master in 6 minutes and 7 seconds (queued for 2 seconds)
latest
Status Name Job ID Coverage
  Test
passed code_coverage #13551

00:01:45

passed code_coverage_report #13552

00:01:47

passed lint_code #13553

00:01:25

passed memory_sanitizer #13550

00:01:38

passed race_detector #13549

00:01:45

passed unit_tests #13548

00:01:40

 
  Build
passed build #13554

00:04:18