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

Error message consistency

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

00:01:38

passed code_coverage_report #13825

00:01:43

passed lint_code #13826

00:01:29

passed memory_sanitizer #13823

00:01:48

passed race_detector #13822

00:01:43

passed unit_tests #13821

00:01:39

 
  Build
passed build #13827

00:04:30