Improve some error messages.