diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp
index dea437b197b..5ad02990346 100644
--- a/src/plugins/projectexplorer/projectconfiguration.cpp
+++ b/src/plugins/projectexplorer/projectconfiguration.cpp
@@ -82,13 +82,16 @@ void ProjectConfigurationAspects::toMap(QVariantMap &map) const
 // ProjectConfiguration
 
 ProjectConfiguration::ProjectConfiguration(QObject *parent, Core::Id id)
-    : QObject(parent), m_id(id)
+    : QObject(parent)
+    , m_id(id)
 {
+    QTC_CHECK(parent);
     QTC_CHECK(id.isValid());
     setObjectName(id.toString());
+
     for (QObject *obj = this; obj; obj = obj->parent()) {
         m_target = qobject_cast<Target *>(obj);
-        if (m_target != nullptr)
+        if (m_target)
             break;
     }
     QTC_CHECK(m_target);
@@ -149,7 +152,6 @@ QVariantMap ProjectConfiguration::toMap() const
 Target *ProjectConfiguration::target() const
 {
     return m_target;
-
 }
 
 bool ProjectConfiguration::fromMap(const QVariantMap &map)
diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h
index c5267de1064..4f7a2194557 100644
--- a/src/plugins/projectexplorer/projectconfiguration.h
+++ b/src/plugins/projectexplorer/projectconfiguration.h
@@ -182,7 +182,6 @@ protected:
     ProjectConfigurationAspects m_aspects;
 
 private:
-    friend class Target; // FIXME: Remove
     Target *m_target = nullptr;
     const Core::Id m_id;
     Utils::DisplayName m_displayName;