Avoid NPE when fields change between class versions