Tweak error message.

Also, do not treat ResolvError any dfiferently from any other StandardError.