DDF-597 add check for null