From ac54c6faa6b73c3da180dec666fadd6e8d7d18e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 15 Oct 2021 16:36:48 +0200
Subject: [PATCH] Fix main GC thread exiting

---
 src/libstore/gc.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index 220441927..648295684 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -538,8 +538,10 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
                     Finally cleanup([&]() {
                         auto conn(connections.lock());
                         auto i = conn->find(fdClient.get());
-                        i->second.detach();
-                        conn->erase(i);
+                        if (i != conn->end()) {
+                            i->second.detach();
+                            conn->erase(i);
+                        }
                     });
 
                     while (true) {