Add null-checking to DescriptionBuilder

Originated from #954