I am a moron. Moved some validation to where it actually should go.