Fix another NPE...