diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index e8486709bbb94f4518ce745350b163980b2e62fe..1daf49534927ae1c8626099935855db084fe3d13 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -446,12 +446,14 @@ void KitManager::addKit(Kit *k)
     if (!k)
         return;
 
-    KitGuard g(k);
-    foreach (KitInformation *ki, d->m_informationList) {
-        if (!k->hasValue(ki->dataId()))
-            k->setValue(ki->dataId(), ki->defaultValue(k));
-        else
-            ki->fix(k);
+    {
+        KitGuard g(k);
+        foreach (KitInformation *ki, d->m_informationList) {
+            if (!k->hasValue(ki->dataId()))
+                k->setValue(ki->dataId(), ki->defaultValue(k));
+            else
+                ki->fix(k);
+        }
     }
 
     d->m_kitList.append(k);