PowerShell
diff --git a/‎src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
Lines changed: 19 additions & 5 deletions b/‎src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
Lines changed: 19 additions & 5 deletions
diff --git a/‎src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
Lines changed: 8 additions & 1 deletion b/‎src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
Lines changed: 8 additions & 1 deletion
@@ -39,6 +39,7 @@ public class EnterPSSessionCommand : PSRemotingBaseCmdlet
         /// </summary>
         public new Int32 ThrottleLimit { set { } get { return 0; } }
         private ObjectStream _stream;
+        private RemoteRunspace _tempRunspace;
 
         #endregion
 
@@ -533,7 +534,18 @@ protected override void EndProcessing()
         ///
         /// </summary>
         protected override void StopProcessing()
-        {
+        {
+            var remoteRunspace = _tempRunspace;
+            if (remoteRunspace != null)
+            {
+                try
+                {
+                    remoteRunspace.CloseAsync();
+                }
+                catch (InvalidRunspaceStateException) { }
+                return;
+            }
+
             IHostSupportsInteractiveSession host = this.Host as IHostSupportsInteractiveSession;
             if (host == null)
             {
@@ -1272,10 +1284,12 @@ private RemoteRunspace GetRunspaceForSSHSession()
         {
             var sshConnectionInfo = new SSHConnectionInfo(this.UserName, ResolveComputerName(HostName), this.KeyFilePath, this.Port);
             var typeTable = TypeTable.LoadDefaultTypeFiles();
-            var remoteRunspace = RunspaceFactory.CreateRunspace(sshConnectionInfo, this.Host, typeTable) as RemoteRunspace;
-            remoteRunspace.Open();
-            remoteRunspace.ShouldCloseOnPop = true;
-
+            _tempRunspace = RunspaceFactory.CreateRunspace(sshConnectionInfo, this.Host, typeTable) as RemoteRunspace;
+            _tempRunspace.Open();
+            _tempRunspace.ShouldCloseOnPop = true;
+            var remoteRunspace = _tempRunspace;
+            _tempRunspace = null;
+            
             return remoteRunspace;
         }
 
 
@@ -1403,6 +1403,7 @@ internal sealed class SSHClientSessionTransportManager : OutOfProcessClientSessi
         private StreamWriter _stdInWriter;
         private StreamReader _stdOutReader;
         private StreamReader _stdErrReader;
+        private bool _connectionEstablished;
         private const string _threadName = "SSHTransport Reader Thread";
 
         #endregion
@@ -1464,7 +1465,12 @@ internal override void CreateAsync()
         internal override void CloseAsync()
         {
             base.CloseAsync();
-            CloseConnection();
+
+            if (!_connectionEstablished)
+            {
+                // If the connection is not yet estalished then clean up any existing connection state.
+                CloseConnection();
+            }
         }
 
         #endregion
@@ -1642,6 +1648,7 @@ private void ProcessReaderThread(object state)
                     else
                     {
                         // Normal output data.
+                        if (!_connectionEstablished) { _connectionEstablished = true; }
                         HandleOutputDataReceived(data);
                     }
                 }
Original file line number	Diff line number	Diff line change
`@@ -1403,6 +1403,7 @@ internal sealed class SSHClientSessionTransportManager : OutOfProcessClientSessi`
`1403`	`1403`	`private StreamWriter _stdInWriter;`
`1404`	`1404`	`private StreamReader _stdOutReader;`
`1405`	`1405`	`private StreamReader _stdErrReader;`
	`1406`	`+ private bool _connectionEstablished;`
`1406`	`1407`	`private const string _threadName = "SSHTransport Reader Thread";`
`1407`	`1408`
`1408`	`1409`	`#endregion`
`@@ -1464,7 +1465,12 @@ internal override void CreateAsync()`
`1464`	`1465`	`internal override void CloseAsync()`
`1465`	`1466`	`{`
`1466`	`1467`	`base.CloseAsync();`
`1467`		`- CloseConnection();`
	`1468`	`+`
	`1469`	`+ if (!_connectionEstablished)`
	`1470`	`+ {`
	`1471`	`+ // If the connection is not yet estalished then clean up any existing connection state.`
	`1472`	`+ CloseConnection();`
	`1473`	`+ }`
`1468`	`1474`	`}`
`1469`	`1475`
`1470`	`1476`	`#endregion`
`@@ -1642,6 +1648,7 @@ private void ProcessReaderThread(object state)`
`1642`	`1648`	`else`
`1643`	`1649`	`{`
`1644`	`1650`	`// Normal output data.`
	`1651`	`+ if (!_connectionEstablished) { _connectionEstablished = true; }`
`1645`	`1652`	`HandleOutputDataReceived(data);`
`1646`	`1653`	`}`
`1647`	`1654`	`}`