Fix yet another NPE