am 2ae7663e: Implement poor man\'s exception handling to prevent errors from killling recovery

* commit '2ae7663e1e064000356ee9e49ebd08bdddc545f9':
  Implement poor man's exception handling to prevent errors from killling recovery