diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index fa224f258d9..6e487e28560 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -1555,7 +1555,14 @@ Toolchains GccToolchainFactory::autoDetect(const ToolchainDetector &detector) co
                                    detector.alreadyKnown,
                                    GccToolchain::RealGcc /*sic!*/);
 
-    return result;
+    // Filter out toolchains with a type that we actually do not have a factory for
+    // e.g. when finding a MinGW toolchain on macOS
+    const auto [filteredResult, toDelete] = Utils::partition(result, [](Toolchain *tc) {
+        return factoryForType(tc->typeId()) != nullptr;
+    });
+    qDeleteAll(toDelete);
+
+    return filteredResult;
 }
 
 Toolchains GccToolchainFactory::detectForImport(const ToolchainDescription &tcd) const
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 69bb22da00a..72e4e1266d1 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -211,6 +211,7 @@ bool Toolchain::canShareBundle(const Toolchain &other) const
 {
     QTC_ASSERT(typeId() == other.typeId(), return false);
     QTC_ASSERT(language() != other.language(), return false);
+    QTC_ASSERT(factory(), return false);
 
     if (int(factory()->supportedLanguages().size()) == 1)
         return false;
@@ -711,7 +712,7 @@ Toolchain *ToolchainFactory::restore(const Store &data)
     QTC_ASSERT(tc, return nullptr);
 
     tc->fromMap(data);
-    if (!tc->hasError())
+    if (!tc->hasError() && QTC_GUARD(tc->typeId() == supportedToolchainType()))
         return tc;
 
     delete tc;
@@ -921,6 +922,7 @@ ToolchainBundle::ToolchainBundle(const Toolchains &toolchains, HandleMissing han
 {
     // Check pre-conditions.
     QTC_ASSERT(!m_toolchains.isEmpty(), return);
+    QTC_ASSERT(factory(), return);
     QTC_ASSERT(m_toolchains.size() <= factory()->supportedLanguages().size(), return);
     for (const Toolchain * const tc : toolchains) {
         QTC_ASSERT(factory()->supportedLanguages().contains(tc->language()), return);
diff --git a/src/plugins/projectexplorer/toolchainkitaspect.cpp b/src/plugins/projectexplorer/toolchainkitaspect.cpp
index 05ce6d9b56e..01e0b18a640 100644
--- a/src/plugins/projectexplorer/toolchainkitaspect.cpp
+++ b/src/plugins/projectexplorer/toolchainkitaspect.cpp
@@ -244,7 +244,8 @@ static void setToolchainsFromAbis(Kit *k, const LanguagesAndAbis &abisByLanguage
     for (auto it = abisByCategory.cbegin(); it != abisByCategory.cend(); ++it) {
         const QList<ToolchainBundle> matchingBundles
             = Utils::filtered(bundles, [&it](const ToolchainBundle &b) {
-                  return b.factory()->languageCategory() == it.key() && b.targetAbi() == it.value();
+                  return b.factory() && b.factory()->languageCategory() == it.key()
+                         && b.targetAbi() == it.value();
               });
 
         if (matchingBundles.isEmpty()) {