bd5add5884
- While there, make error messages consistent with the rest. Approved by: kib (mentor)
- While there, make error messages consistent with the rest. Approved by: kib (mentor)