Here's the next version of the error recovery patchset incorporating some changes suggested by ickle (Thanks!). I think we are quickly converging on a mergeable product. Rip it apart! Thanks, - Ben