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

Error message consistency

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

00:01:37

passed code_coverage_report #13762

00:01:35

passed lint_code #13763

00:01:22

passed memory_sanitizer #13760

00:01:50

passed race_detector #13759

00:01:40

passed unit_tests #13758

00:01:41

 
  Build
passed build #13764

00:04:10