Fixed another NPE