diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index 88b54aa83e9..2d1fa847285 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -2712,13 +2712,23 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 			return false;
 		}
 		if (session.getExecutor().isInExecutorThread()) {
-			return getRunControl().isSuspended(targetContext);
+			IRunControl runControl = getRunControl();
+			if (runControl == null) {
+				return false;
+			} else {
+				return runControl.isSuspended(targetContext);
+			}
 		}
 		Query<Boolean> query = new Query<Boolean>() {
 			@Override
 			protected void execute(DataRequestMonitor<Boolean> rm) {
 				try {
-					rm.setData(getRunControl().isSuspended(targetContext));
+					IRunControl runControl = getRunControl();
+					if (runControl == null) {
+						rm.setData(false);
+					} else {
+						rm.setData(runControl.isSuspended(targetContext));
+					}
 				} finally {
 					rm.done();
 				}