s4-s3-upgrade Fix error handling in add_users_to_group