DDF-227 fixed possible null pointer with missing metadata