Merge change 25401 into eclair

* changes:
  Add a null checking to avoid crash.