diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
index 006c75ccd56..ebb08080636 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
@@ -120,6 +120,8 @@ public:
     template<class T> static T *earlierBuildStep(const ProjectExplorer::DeployConfiguration *dc,
         const ProjectExplorer::BuildStep *laterBuildStep)
     {
+        if (!dc)
+            return 0;
         const ProjectExplorer::BuildStepList * const bsl = dc->stepList();
         const QList<ProjectExplorer::BuildStep *> &buildSteps = bsl->steps();
         for (int i = 0; i < buildSteps.count(); ++i) {
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 3848cf08a7b..7d6eafebcbd 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -310,7 +310,7 @@ QString MaemoRunConfiguration::remoteExecutableFilePath() const
 
 MaemoPortList MaemoRunConfiguration::freePorts() const
 {
-    return deployStep()->freePorts();
+    return deployStep() ? deployStep()->freePorts() : MaemoPortList();
 }
 
 bool MaemoRunConfiguration::useRemoteGdb() const