ENG-6420: fix npe.