DDF-584 - added null check on constraints list