diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index 1af1f95486a..868cf947a01 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -264,11 +264,21 @@ void DebuggerKitAspect::fix(Kit *k)
         return;
 
     if (rawId.type() == QVariant::String) {
-        if (!DebuggerItemManager::findById(rawId)) {
+        const DebuggerItem * const item = DebuggerItemManager::findById(rawId);
+        if (!item) {
             qWarning("Unknown debugger id %s in kit %s",
                      qPrintable(rawId.toString()), qPrintable(k->displayName()));
             k->setValue(DebuggerKitAspect::id(), QVariant());
+            setup(k);
+            return;
         }
+        const Abi tcAbi = ToolChainKitAspect::targetAbi(k);
+        for (const Abi &abi : item->abis()) {
+            if (abi.isCompatibleWith(tcAbi))
+                return;
+        }
+        k->setValue(DebuggerKitAspect::id(), QVariant());
+        setup(k);
         return; // All fine (now).
     }
 
diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp
index 8b177d2e167..219b546608d 100644
--- a/src/plugins/qtsupport/qtprojectimporter.cpp
+++ b/src/plugins/qtsupport/qtprojectimporter.cpp
@@ -90,6 +90,7 @@ Kit *QtProjectImporter::createTemporaryKit(const QtVersionData &versionData,
         }
 
         additionalSetup(k);
+        k->fix();
     });
 }