Modified select_on_master() to only have one code path to exit