diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemActionViewerFilter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemActionViewerFilter.java
index 14e54f1c9d3..38aa50464b3 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemActionViewerFilter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemActionViewerFilter.java
@@ -150,6 +150,8 @@ public class SystemActionViewerFilter extends ViewerFilter {
 	 */
 	public boolean select(Viewer viewer, Object parentElement, Object element) {
 		
+	
+		
 		// check if the object is an instance of one of the object types we want to filter
 		Class objType = isInstance(element);
 		
@@ -165,6 +167,12 @@ public class SystemActionViewerFilter extends ViewerFilter {
 			IAdaptable adaptable = (IAdaptable)element;
 			
 			adapter = (ISystemViewElementAdapter)(adaptable.getAdapter(ISystemViewElementAdapter.class));
+			if (adapter == null)
+			{
+				// might be deferred stuff
+				return true;
+			}
+			
 			
 			// get list of criteria
 			List criteria = (List)(map.get(objType));