DDF-13 Removing redundant null check for code clarity