DDF-953 fixed possible null pointers