Corrected the case where a part of the passed in description may be
null