revert error handler comment-out