Improve error message displays for a variety of situations