Further error message improvements