ENH: error recovery