diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMNode.java
index 10f3d26bd53..b326a0219bc 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMNode.java
@@ -65,12 +65,8 @@ public class BreakpointOrganizerVMNode extends AbstractVMNode {
                 this, update.getElementPath(), 
                 new ViewerDataRequestMonitor<List<BreakpointOrganizerVMContext>>(getExecutor(), update) {
                     @Override
-                    protected void handleCompleted() {
-                        if (isSuccess()) {
-                            update.setHasChilren(!getData().isEmpty());
-                        } else {
-                            update.setHasChilren(false);
-                        }
+                    protected void handleSuccess() {
+                        update.setHasChilren(!getData().isEmpty());
                         update.done();
                     }
                 });
@@ -84,12 +80,8 @@ public class BreakpointOrganizerVMNode extends AbstractVMNode {
                 this, update.getElementPath(), 
                 new ViewerDataRequestMonitor<List<BreakpointOrganizerVMContext>>(getExecutor(), update) {
                     @Override
-                    protected void handleCompleted() {
-                        if (isSuccess()) {
-                            update.setChildCount(getData().size());
-                        } else {
-                            update.setChildCount(0);
-                        }
+                    protected void handleSuccess() {
+                        update.setChildCount(getData().size());
                         update.done();
                     }
                 });