Improving some error messages.