diff --git a/mRemoteV1/Connection/Protocol/PuttyBase.cs b/mRemoteV1/Connection/Protocol/PuttyBase.cs
index 8772c8ef1..ebbc76048 100644
--- a/mRemoteV1/Connection/Protocol/PuttyBase.cs
+++ b/mRemoteV1/Connection/Protocol/PuttyBase.cs
@@ -237,8 +237,11 @@ namespace mRemoteNG.Connection.Protocol
 			try
 			{
                 Console.WriteLine(@"Skipping Dispose for now!");
+                PuttyProcess.Close();
+                // TODO: Figure out why this hangs...
                 //PuttyProcess.Dispose();
-			}
+                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyDisposeFailed + Environment.NewLine + @"SKIPPING DISPOSE - CAUSES HANG IN THIS BUILD!!!", true);
+            }
 			catch (Exception ex)
 			{
 				Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyDisposeFailed + Environment.NewLine + ex.Message, true);