Hotfix for error handling