Fixing another NPE