Should this be an early return too?