diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java
index 60d048bdc42..76010b92e51 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewProvider.java
@@ -135,7 +135,8 @@ public class SystemTableViewProvider implements ILabelProvider, ITableLabelProvi
 	    {
 	        result = SystemAdapterHelpers.getViewAdapter(object);
 	    }
-        result.setPropertySourceInput(object);
+	    if (result != null)
+	    	result.setPropertySourceInput(object);
         return result;
 	}