DDF-525 added check for null subject