diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java
index 3a0db815325..6f1592b26f6 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java
@@ -233,20 +233,28 @@ public class SystemCommonDeleteAction
 	 */
 	protected Dialog createDialog(Shell shell)
 	{
-		SystemDeleteDialog dlg = new SystemDeleteDialog(shell);
-		if (promptLabel != null)
-			dlg.setPromptLabel(promptLabel);
 		Object firstSelection = getFirstSelection();
-		if (getRemoteAdapter(firstSelection) != null)
+		if (firstSelection != null)
 		{
-           String warningMsg = null;
-           String warningTip = null;
-
-             warningMsg = SystemResources.RESID_DELETE_WARNING_LABEL;
-             warningTip = SystemResources.RESID_DELETE_WARNING_TOOLTIP;
-           dlg.setWarningMessage(warningMsg,warningTip);
+			SystemDeleteDialog dlg = new SystemDeleteDialog(shell);
+			if (promptLabel != null)
+				dlg.setPromptLabel(promptLabel);
+		
+			if (getRemoteAdapter(firstSelection) != null)
+			{
+	           String warningMsg = null;
+	           String warningTip = null;
+	
+	             warningMsg = SystemResources.RESID_DELETE_WARNING_LABEL;
+	             warningTip = SystemResources.RESID_DELETE_WARNING_TOOLTIP;
+	           dlg.setWarningMessage(warningMsg,warningTip);
+			}
+			return dlg;
+		}
+		else
+		{
+			return null;
 		}
-		return dlg;
 	}
 	
 	
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonRenameAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonRenameAction.java
index 13d6440e0a4..cc45697f8c8 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonRenameAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonRenameAction.java
@@ -177,7 +177,7 @@ public class SystemCommonRenameAction extends SystemBaseDialogAction
 		  	return dlg;
 		}
 		// single-select
-		else
+		else if (getSelection().size() == 1)
 		{
 		  	SystemRenameSingleDialog dlg = new SystemRenameSingleDialog(parent);
 		  	if (copyCollisionMode)
@@ -190,6 +190,10 @@ public class SystemCommonRenameAction extends SystemBaseDialogAction
 				dlg.setPromptLabel(promptLabel, promptTip);
 		  	return dlg;
 		}
+		else
+		{
+			return null;
+		}
 	}
 	
 	/**