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

Error message consistency

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

00:01:41

passed code_coverage_report #13639

00:01:43

passed lint_code #13640

00:01:32

passed memory_sanitizer #13637

00:01:51

passed race_detector #13636

00:01:38

passed unit_tests #13635

00:01:38

 
  Build
passed build #13641

00:04:31