Error message improvements.