Improve phrasing on exception message instead of trying to fix callers