diff --git a/src/main.cc b/src/main.cc
index 927aebb0..79245fc8 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -231,6 +231,10 @@ int main(int argc, char* argv[])
         {
              write_debug("error while parsing kakrc: "_str + error.what());
         }
+        catch (Kakoune::client_removed&)
+        {
+             write_debug("error while parsing kakrc: asked to quit");
+        }
 
         if (parser.positional_count() != 0)
         {
diff --git a/src/remote.cc b/src/remote.cc
index 8eb3c88b..7b68f6f8 100644
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -452,6 +452,7 @@ private:
                 {
                     write_debug("error running command '" + m_buffer + "' : " + e.what());
                 }
+                catch (client_removed&) {}
                 ClientManager::instance().redraw_clients();
                 close(socket);
                 delete this;