NPE protection
Move polymorphic dispatching into subvalidators