This may be better to do in the helper so it occurs everywhere. I'm not sure if tests rely on the current behavior of returning early.