diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 670c2d57cfc66c24c54c90fd54d437fd2dcd5a4f..771a408040e2bbfd0fb5e9de4eb01e5838fb6233 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -127,7 +127,11 @@ void CMakeProject::updateToolChain(const QString &compiler)
     //qDebug()<<"CodeBlocks Compilername"<<compiler
     ProjectExplorer::ToolChain *newToolChain = 0;
     if (compiler == "gcc") {
+#ifdef Q_OS_WIN
+        newToolChain = ProjectExplorer::ToolChain::createMinGWToolChain("gcc", QString());
+#else
         newToolChain = ProjectExplorer::ToolChain::createGccToolChain("gcc");
+#endif
     } else if (compiler == "msvc8") {
         // TODO MSVC toolchain
         newToolChain = ProjectExplorer::ToolChain::createMSVCToolChain(value(activeBuildConfiguration(), "msvcVersion").toString(), false);
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 1aa284121c11dea70cd1fc6e0d0346474034e7cc..81185859b5dad54e758b50931aa5b12c3df0588d 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -245,6 +245,8 @@ bool MinGWToolChain::equals(ToolChain *other) const
 void MinGWToolChain::addToEnvironment(ProjectExplorer::Environment &env)
 {
     //qDebug()<<"MinGWToolChain::addToEnvironment";
+    if (m_mingwPath.isEmpty())
+        return;
     QString binDir = m_mingwPath + "/bin";
     if (QFileInfo(binDir).exists())
         env.prependOrSetPath(binDir);