diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
index 2b583b3229c..b9d8bd0f4db 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
@@ -555,14 +555,6 @@ public class GDBProcesses_7_0 extends AbstractDsfService
     }
     
     public void isDebuggerAttachSupported(IDMContext dmc, DataRequestMonitor<Boolean> rm) {
-		// Until bug 256798 is fixed, the service tracker could be null
-		if (getServicesTracker() == null) {
-			// service is shutdown
-			rm.setData(false);
-			rm.done();
-			return;
-		}
-
     	IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class);
     	rm.setData(backend.getIsAttachSession());
     	rm.done();
@@ -590,14 +582,6 @@ public class GDBProcesses_7_0 extends AbstractDsfService
 	}
 	
     public void canDetachDebuggerFromProcess(IDMContext dmc, DataRequestMonitor<Boolean> rm) {
-		// Until bug 256798 is fixed, the service tracker could be null
-		if (getServicesTracker() == null) {
-			// service is shutdown
-			rm.setData(false);
-			rm.done();
-			return;
-		}
-
     	IGDBBackend backend = getServicesTracker().getService(IGDBBackend.class);
     	rm.setData(backend.getIsAttachSession() && fCommandControl.isConnected());
     	rm.done();
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl.java
index 9cbd4bfac21..ee80e7ee44f 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl.java
@@ -163,14 +163,6 @@ public class GDBRunControl extends MIRunControl {
     		// A step return will always be done in the top stack frame.
     		// If the top stack frame is the only stack frame, it does not make sense
     		// to do a step return since GDB will reject it.
-    		
-    		// Until bug 256798 is fixed, the service tracker could be null
-    		if (getServicesTracker() == null) {
-    			// service is shutdown
-    			rm.setData(false);
-    			rm.done();
-    			return;
-    		}
             MIStack stackService = getServicesTracker().getService(MIStack.class);
             if (stackService != null) {
             	// Check that the stack is at least two deep.
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0.java
index c357ca0f6c7..62833b61650 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0.java
@@ -143,14 +143,6 @@ public class GDBRunControl_7_0 extends MIRunControl implements IReverseRunContro
     		// A step return will always be done in the top stack frame.
     		// If the top stack frame is the only stack frame, it does not make sense
     		// to do a step return since GDB will reject it.
-    		
-    		// Until bug 256798 is fixed, the service tracker could be null
-    		if (getServicesTracker() == null) {
-    			// service is shutdown
-    			rm.setData(false);
-    			rm.done();
-    			return;
-    		}
             MIStack stackService = getServicesTracker().getService(MIStack.class);
             if (stackService != null) {
             	// Check that the stack is at least two deep.
@@ -190,14 +182,6 @@ public class GDBRunControl_7_0 extends MIRunControl implements IReverseRunContro
     		// A step return will always be done in the top stack frame.
     		// If the top stack frame is the only stack frame, it does not make sense
     		// to do a step return since GDB will reject it.
-    		
-    		// Until bug 256798 is fixed, the service tracker could be null
-    		if (getServicesTracker() == null) {
-    			// service is shutdown
-    			rm.setData(false);
-    			rm.done();
-    			return;
-    		}
             MIStack stackService = getServicesTracker().getService(MIStack.class);
             if (stackService != null) {
             	// Check that the stack is at least two deep.