diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/actions/DsfCommandRunnable.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/actions/DsfCommandRunnable.java
index 3dcb478854d..bc566c454b6 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/actions/DsfCommandRunnable.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/actions/DsfCommandRunnable.java
@@ -56,7 +56,7 @@ public abstract class DsfCommandRunnable extends DsfRunnable {
         }
         if (getContext() == null) {
             fRequest.setStatus(makeError("Selected object does not support run control.", null));             //$NON-NLS-1$
-        } else if (getRunControl() == null) {
+        } else if (getRunControl() == null || getStepQueueMgr() == null) {
             fRequest.setStatus(makeError("Run Control not available", null)); //$NON-NLS-1$
         } else {
             doExecute();