Fix market-reported NPE.