Okay, last nit then I'll merge this.  These errors should be identical to the errors you actually throw.  Use the shorter once from the exception here as well.