error message improvements