Hotfix error catch