Fix error handling impl. Abstract the helpers a bit to fix a bug. Catch remote errors and bubble them up.