Fix TOC Error Handling