Merge change 6543 into donut

* changes:
  Adding a missing catch