DDF-94 removed other potential NPE identified in code review.