diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 03bd454eab7aa568f91019c842da36a22fb7f52a..b7021c58a4e5a792dda8af7d1206b30676372927 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -238,12 +238,14 @@ bool MakeStep::init()
 
     setOutputParser(parser);
 
+    m_scriptTarget = (bc->qt4Target()->qt4Project()->rootQt4ProjectNode()->projectType() == ScriptTemplate);
+
     return AbstractProcessStep::init();
 }
 
 void MakeStep::run(QFutureInterface<bool> & fi)
 {
-    if (qt4BuildConfiguration()->qt4Target()->qt4Project()->rootQt4ProjectNode()->projectType() == ScriptTemplate) {
+    if (m_scriptTarget) {
         fi.reportResult(true);
         return;
     }
@@ -351,13 +353,22 @@ void MakeStepConfigWidget::qtVersionChanged()
 
 void MakeStepConfigWidget::updateMakeOverrideLabel()
 {
-    Qt4BuildConfiguration *qt4bc = m_makeStep->qt4BuildConfiguration();
-    m_ui->makeLabel->setText(tr("Override %1:").arg(qt4bc->makeCommand()));
+    Qt4BuildConfiguration *bc = m_makeStep->qt4BuildConfiguration();
+    if (!bc)
+        bc = qobject_cast<Qt4BuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
+    if (bc)
+        m_ui->makeLabel->setText(tr("Override %1:").arg(bc->makeCommand()));
+    else
+        m_ui->makeLabel->setText(tr("Make:"));
 }
 
 void MakeStepConfigWidget::updateDetails()
 {
     Qt4BuildConfiguration *bc = m_makeStep->qt4BuildConfiguration();
+    if (!bc)
+        bc = qobject_cast<Qt4BuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
+    if (!bc)
+        m_summaryText = tr("No qt4 buildconfiguration."); // Can't happen
 
     ProjectExplorer::ProcessParameters param;
     param.setMacroExpander(bc->macroExpander());
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index 7cac6229c44df93506a080b81201b79dd7400bdb..0507d24b6da630d154ea735e04c4329c8847c715 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -113,6 +113,7 @@ protected:
 private:
     void ctor();
     bool m_clean;
+    bool m_scriptTarget;
     QString m_makeFileToCheck;
     QString m_userArgs;
     QString m_makeCmd;