Improve handling of errors

• #80 by @Gekkio improves handling of the stack on errors.
• #77 by @pasieronen preserves the original error on a rejection

Thanks!