Fix another NPE (probably innocent, but good to fix anyway)