Added more error messages.