Can we somehow invert the process to make error handling easier without a full SahiClient API rewrite?