ENG-6375 Fix NPE in new retry logic.