DDF-495 added null check for subject