another NPE fix