Merge change 5391 into donut

* changes:
  Fix an NPE.