diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 6c97502dd6b..43870201dbd 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -419,7 +419,7 @@ void Project::setDocument(Core::IDocument *doc)
     d->m_document = doc;
 
     if (!d->m_rootProjectNode) {
-        auto newRoot = new ProjectNode(projectFilePath());
+        auto newRoot = new ProjectNode(projectDirectory());
         newRoot->setDisplayName(displayName());
         newRoot->addNode(new FileNode(projectFilePath(), FileType::Project, false));
         setRootProjectNode(newRoot);
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h
index 67878b23570..89f6039dd6e 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.h
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.h
@@ -69,10 +69,10 @@ public:
     QmakeProFileNode *proFileNode() const;
 
 protected:
-    QmakeProject *m_project;
+    QmakeProject *m_project = nullptr;
 
 private:
-    QmakeProFileNode *m_qmakeProFileNode;
+    QmakeProFileNode *m_qmakeProFileNode = nullptr;
 };
 
 // Implements ProjectNode for qmake .pro files