diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 005be16ab83..d48c9a389e6 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -561,9 +561,11 @@ QSet<Id> KitFeatureProvider::availablePlatforms() const
 QString KitFeatureProvider::displayNameForPlatform(Id id) const
 {
     foreach (IDeviceFactory *f, ExtensionSystem::PluginManager::getObjects<IDeviceFactory>()) {
-        const QString dn = f->displayNameForId(id);
-        if (!dn.isEmpty())
+        if (f->availableCreationIds().contains(id)) {
+            const QString dn = f->displayNameForId(id);
+            QTC_ASSERT(!dn.isEmpty(), continue);
             return dn;
+        }
     }
     return QString();
 }