Merge change 22893 into eclair

* changes:
  Simplifies err code propagation.