Part 2: Avoid NPE when fields change between class versions