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

Error message consistency

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

00:01:49

passed code_coverage_report #13702

00:01:37

passed lint_code #13703

00:01:28

passed memory_sanitizer #13700

00:01:44

passed race_detector #13699

00:01:31

passed unit_tests #13698

00:01:40

 
  Build
passed build #13704

00:04:12