Hotfix error handling
Update timeout handling