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 94e249c6993..08e2dc20a71 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 @@ -294,7 +294,7 @@ public class SystemView extends SafeTreeViewer if (parentName.equals(itemToExpand.remoteName)){ // same item } - else if (itemToExpand.remoteName.startsWith(parentName)){ + else if (itemToExpand.remoteName != null && itemToExpand.remoteName.startsWith(parentName)){ // child item subChildren.add(itemToExpand); }