Fix another NPE.