diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java
index d64364041bb..70b3f8fc6f7 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java
@@ -609,7 +609,10 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
 		if (set != null)
 		{
 			IProperty property = set.getProperty(COMMAND_SHELLS_MEMENTO);
-			property.setValue(shellBuffer.toString());
+			if (property != null)
+			{
+				property.setValue(shellBuffer.toString());
+			}
 		}
 	}