Fix issues with null parts