Improved friendliness of the error messages