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 c0142869a67..8ab4e0cbe23 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
@@ -1721,12 +1721,15 @@ public class SystemView extends SafeTreeViewer
 						if (sysType != null) { // sysType can be null if workspace contains a host that is no longer defined by the workbench
 							RSESystemTypeAdapter adapter = (RSESystemTypeAdapter)(sysType.getAdapter(RSESystemTypeAdapter.class));
 
-							if (!adapter.isEnabled(sysType))
+							if (adapter == null || !adapter.isEnabled(sysType))
 							{
 								// don't add this if our src is not enabled
 								return Status.OK_STATUS;
 							}
 						}
+						else {
+							return Status.OK_STATUS;
+						}
 					}
 					
 					//System.out.println("ADDING CONNECTIONS.........................: " + addingConnection);