NXP-8672: fix NPE when removing an old member