HOTFIX: Ensure connections are cleaned up even after catastrophic failure [AI-446]