Add null checks to DescriptionBuilder