fix yet another NPE