diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
index 3c3ad9c0b55..807b660f324 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
@@ -674,9 +674,12 @@ public class SystemCommandsViewPart
 			if (cmds == null || cmds.length == 0)
 			{
 				cmds = cmdSS.restoreShellState(getShell());
-				for (int i = 0; i < cmds.length; i++)
+				if (cmds!=null)
 				{
-					updateOutput(cmds[i]);
+					for (int i = 0; i < cmds.length; i++)
+					{
+						updateOutput(cmds[i]);
+					}
 				}
 			}
 		}