I think that changing the error message will be necessary when we bubble it up to the user.  I'd like to get some error examples to try out what that transformation would look like.