NXP-13415: fix setting variables, don't set to null a variable not present in the map