2 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp
index 6af10c3553..27ac6a4504 100644
--- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp
@@ -196,6 +196,12 @@ void BuildDirManager::setParametersAndRequestParse(const BuildDirParameters &par
                                                    int newReaderReparseOptions,
                                                    int existingReaderReparseOptions)
 {
+    if (!parameters.cmakeTool) {
+        TaskHub::addTask(Task::Error,
+                         tr("The kit needs to define a CMake tool to parse this project."),
+                         ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
+        return;
+    }
     QTC_ASSERT(parameters.isValid(), return);
 
     if (m_reader)
diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp
index 8432551696..097840072f 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.cpp
+++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp
@@ -279,8 +279,7 @@ static std::vector<std::unique_ptr<FileNode>> &&
 removeKnownNodes(const QSet<Utils::FileName> &knownFiles,
                  std::vector<std::unique_ptr<FileNode>> &&files)
 {
-    std::remove_if(std::begin(files), std::end(files),
-                   [&knownFiles](const std::unique_ptr<FileNode> &n) {
+    Utils::erase(files, [&knownFiles](const std::unique_ptr<FileNode> &n) {
         return knownFiles.contains(n->filePath());
     });
     return std::move(files);