Merge change 8298 into donut

* changes:
  Minor NPE fix.