DDF-156: Adjusted code to allow null content versions