diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index cac25f7566a..19de5ea3a30 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -406,7 +406,7 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
 {
     qDebug()<<"Qt4Project::toolChain() for buildconfiguration:"<<buildConfiguration;
     Q_UNUSED(buildConfiguration);
-    ToolChain *m_test;
+    ToolChain *m_test= 0;
     QtVersion *version = qtVersion(activeBuildConfiguration());
     ToolChain::ToolChainType t = version->toolchainType();
     if (t == ToolChain::MinGW) {
@@ -436,9 +436,7 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
         qDebug()<<"Qt Creator doesn't know about the system includes, nor the systems defines.";
     }
 
-
-
-    if (m_test == m_toolChain) {
+    if (ToolChain::equals(m_test, m_toolChain)) {
         delete m_test;
     } else {
         delete m_toolChain;
@@ -716,7 +714,9 @@ ProjectExplorer::Environment Qt4Project::baseEnvironment(const QString &buildCon
 {
     Environment env = useSystemEnvironment(buildConfiguration) ? Environment(QProcess::systemEnvironment()) : Environment();
     qtVersion(buildConfiguration)->addToEnvironment(env);
-    toolChain(buildConfiguration)->addToEnvironment(env);
+    ToolChain *tc = toolChain(buildConfiguration);
+    if (tc)
+        tc->addToEnvironment(env);
     return env;
 }