Move the check for missing options up into the right spot(s)