Good call.  We should pull all of these validations out so they can be run in both places.