diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
index 59e61beb9f0..f11483d69f1 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
@@ -2012,12 +2012,17 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	    	   	        return Status.OK_STATUS;
 	                  if ((parentItem instanceof Item) && !getExpanded((Item)parentItem))    	   	        
 	                    refresh(parent); // flush memory
+	                  else if (parentItem instanceof Tree)
+	                  {
+	                	  refresh();
+	                  }
 	                  else
 	                  {  
 	   	    	        wasSelected = isSelectedOrChildSelected(multiSource);
 	   	    	        if (wasSelected)
 	   	    	          clearSelection();
-	    	   	        _originatingViewer.remove(multiSource);   	    	        
+	   	    	        if (_originatingViewer != null)
+	   	    	        	_originatingViewer.remove(multiSource);   	    	        
 	   	    	        if (wasSelected)
 	    	   	          setSelection(new StructuredSelection(parent),true);
 	                  }
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
index 59e61beb9f0..f11483d69f1 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
@@ -2012,12 +2012,17 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	    	   	        return Status.OK_STATUS;
 	                  if ((parentItem instanceof Item) && !getExpanded((Item)parentItem))    	   	        
 	                    refresh(parent); // flush memory
+	                  else if (parentItem instanceof Tree)
+	                  {
+	                	  refresh();
+	                  }
 	                  else
 	                  {  
 	   	    	        wasSelected = isSelectedOrChildSelected(multiSource);
 	   	    	        if (wasSelected)
 	   	    	          clearSelection();
-	    	   	        _originatingViewer.remove(multiSource);   	    	        
+	   	    	        if (_originatingViewer != null)
+	   	    	        	_originatingViewer.remove(multiSource);   	    	        
 	   	    	        if (wasSelected)
 	    	   	          setSelection(new StructuredSelection(parent),true);
 	                  }