diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/StepQueueManager.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/StepQueueManager.java
index 0d148b08b28..e73bec79996 100644
--- a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/StepQueueManager.java
+++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/StepQueueManager.java
@@ -237,12 +237,14 @@ public class StepQueueManager extends AbstractDsfService
                     new DsfRunnable() { public void run() {
                         fTimedOutFutures.remove(e.getDMContext());
 
-                        // Issue the stepping time-out event.
-                        getSession().dispatchEvent(
-                            new ISteppingTimedOutEvent() { 
-                                public IExecutionDMContext getDMContext() { return e.getDMContext(); }
-                            }, 
-                            getProperties());
+                        if (getSession().isActive()) {
+                            // Issue the stepping time-out event.
+                            getSession().dispatchEvent(
+                                new ISteppingTimedOutEvent() { 
+                                    public IExecutionDMContext getDMContext() { return e.getDMContext(); }
+                                }, 
+                                getProperties());
+                        }
                     }},
                     STEPPING_TIMEOUT, TimeUnit.MILLISECONDS)
                 );