Fix assumption of null attributes.