Add max-tries logic to Stop()