fixed yet another NPE