Summary: Improve error message formatting to give more information to user.  Also, catch a corner case related to 6930553 and 6844449.
Reviewed-by: kvn