For ENG-5962, work around a bizarre NPE that might signal a larger problem