It looks like this adds the executor to the list of failed ones in all cases, even for FetchFailed?