From fb44e49dfb4d4dc11c7eafea6346f7fa4ebf7969 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 9 Aug 2007 15:27:32 +0000
Subject: [PATCH] Avoid odd NPE killing all the SystemView

---
 .../UI/org/eclipse/rse/internal/ui/view/SystemView.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0fff698a355..9e47e1d395e 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
@@ -3508,7 +3508,7 @@ public class SystemView extends SafeTreeViewer
 					((TreeItem) item).setExpanded(true);
 					if (debug) System.out.println("Re-Expanded RemoteItem: " + itemToExpand.remoteName); //$NON-NLS-1$
 				} else if (debug) System.out.println("Re-Expand of RemoteItem '" + itemToExpand.remoteName + "' failed. Not found"); //$NON-NLS-1$ //$NON-NLS-2$
-			} else {
+			} else if (itemToExpand.data!=null) {
 				setExpandedState(itemToExpand.data, true);
 				if (debug) System.out.println("Re-Expanded non-remote Item: " + itemToExpand.data); //$NON-NLS-1$
 			}