Fixed for some null attributes.