Add null-checking to DescriptionBuilder

Originated from #954
I also removed this additional level of indirection. Please, review that its ok.