Fixed another NPE.