Merge change 7495

* changes:
  Improve error handling