Bug 84111 - Exception while running test suite

1 files changed, 10 insertions, 8 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeViewer.java
index 51195d7ac..fa45ada11 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/RemoteTreeViewer.java
@@ -360,14 +360,16 @@ public class RemoteTreeViewer extends TreeViewer {
         if (widget != null) {
             final Item[] currentChildren = getChildren(widget);
             if (offset < currentChildren.length) {
-		        preservingSelection(new Runnable() {
-		            public void run() {
-		        	    for (int i = offset; i < currentChildren.length; i++) {
-		        	        disassociate(currentChildren[i]);
-		        	        currentChildren[i].dispose();
-		        	    }
-		            }
-		        });
+                preservingSelection(new Runnable() {
+                    public void run() {
+                        for (int i = offset; i < currentChildren.length; i++) {
+                            if (currentChildren[i].getData() != null) {
+                                disassociate(currentChildren[i]);
+                            } 
+                            currentChildren[i].dispose();
+                        }
+                    }
+                });
             }
         }
     }