DDF-953 fixed possible null pointer
DDF-953 fixed possible null pointer