Repair error handling.