diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 5add4f4e559..1bca2bbb651 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -377,16 +377,17 @@ void CMakeBuildSystem::setParametersAndRequestParse(const BuildDirParameters &pa
         return; // ignore request, this build configuration is not active!
     }
 
-    if (!parameters.cmakeTool()) {
+    const CMakeTool *tool = parameters.cmakeTool();
+    if (!tool || !tool->isValid()) {
         TaskHub::addTask(
             BuildSystemTask(Task::Error,
                             tr("The kit needs to define a CMake tool to parse this project.")));
         return;
     }
-    if (!parameters.cmakeTool()->hasFileApi()) {
-        TaskHub::addTask(BuildSystemTask(Task::Error,
-                                         CMakeKitAspect::msgUnsupportedVersion(
-                                             parameters.cmakeTool()->version().fullVersion)));
+    if (!tool->hasFileApi()) {
+        TaskHub::addTask(
+            BuildSystemTask(Task::Error,
+                            CMakeKitAspect::msgUnsupportedVersion(tool->version().fullVersion)));
         return;
     }
     QTC_ASSERT(parameters.isValid(), return );
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 6c39ddef419..bddffdc762e 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -261,7 +261,7 @@ Tasks CMakeKitAspect::validate(const Kit *k) const
 {
     Tasks result;
     CMakeTool *tool = CMakeKitAspect::cmakeTool(k);
-    if (tool) {
+    if (tool && tool->isValid()) {
         CMakeTool::Version version = tool->version();
         if (version.major < 3 || (version.major == 3 && version.minor < 14)) {
             result << BuildSystemTask(Task::Warning, msgUnsupportedVersion(version.fullVersion));