fix null populated properties