NXP-13315 fix NPE + missing invalidation