DDF-495 fixed potential npe parameter list with a null