ENG-5156 fix recent NPE