diff --git a/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.cpp b/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.cpp
index 8433ace8a979dca22f807b03325ad2551fff1c16..be3ba91a5f904c91a1aac334312758d88b8bc97f 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.cpp
@@ -35,6 +35,7 @@
 #include <utils/environment.h>
 #include <utils/qtcassert.h>
 
+#include <QCoreApplication>
 #include <QStringList>
 #include <QTimer>
 
@@ -99,6 +100,13 @@ void DeviceApplicationRunner::start(const IDevice::ConstPtr &device,
         return;
     }
 
+    if (command.isEmpty()) {
+        emit reportError(QCoreApplication::translate("RemoteLinux::RemoteLinuxRunConfiguration",
+                                                     "Don't know what to run.")); // FIXME: Transitional message for 3.0.
+        setFinished();
+        return;
+    }
+
     d->stopRequested = false;
     d->success = true;
 
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 5b872ecde71d9892379c3d7f3dbaa575199df2ba..7f3bcf15b342eae5afbacc918d248b2dec0b1def 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -120,11 +120,6 @@ void RemoteLinuxRunConfiguration::init()
 
 bool RemoteLinuxRunConfiguration::isEnabled() const
 {
-    if (remoteExecutableFilePath().isEmpty()) {
-        d->disabledReason = tr("Don't know what to run.");
-        return false;
-    }
-    d->disabledReason.clear();
     return true;
 }