Add failure trapping, ignored finish argument