DDF-953 fixed null pointer