diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
index 847ff4c1bb9..8f26b78e046 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
@@ -740,11 +740,15 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
 			// indicate completion of step
         	final IExecutionDMContext dmc = DMContexts.getAncestorOfType(context, IExecutionDMContext.class);
         	if (dmc != null) {
-        	    fController.getExecutor().execute(new DsfRunnable() {
-        	        public void run() {
-                        fController.doneStepping(dmc, DsfSourceDisplayAdapter.this);
-        	        };
-        	    });
+        		try {
+        			fController.getExecutor().execute(new DsfRunnable() {
+        				public void run() {
+        					fController.doneStepping(dmc, DsfSourceDisplayAdapter.this);
+        				};
+        			});
+        		} catch (RejectedExecutionException e) {
+        			// Session is shutdown
+        		}
         	}
         }
 	}