Fix another NPE