Remove Timeout System - Handle Errors Correctly