Forgot a few return short-circuit statements