Added the error recovery