Merge change I4a943184 into eclair

* changes:
  Avoid trying to throw multiple exceptions at once.