Error messages tidy-up
Errors tidy-up