Hotfix: connect error handling