NXP-12980/NXP-9343: avoid NPE when retrieving last update status + cleanup