For ENG-6244, add missing null check that was making life so difficult