Merge change 25523 into eclair

* changes:
  Add additional error checking, exit early if errors occur.