diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index eab762ad1..60b32dd0a 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,9 +1,11 @@
-1.75.7006 (2017-xx-xx):
+1.75.7006 (2017-06-xx):
 
 Fixes:
 ------
+#527: Additional protections to avoid problems on update check in heavily firewalled environments
 #530: Fixed issue where using External Tool on existing connection causes creation of 'New Connection' entry
-
+#531: Update PuTTYNG to 0.69
+#546: Quick Connect from notification area icon displays warning when clicking on a folder (see #334)
 
 1.75.7005 (2017-04-27):
 
diff --git a/mRemoteV1/App/Update/UpdateFile.cs b/mRemoteV1/App/Update/UpdateFile.cs
index b1bd6bb72..b5ea64e6a 100644
--- a/mRemoteV1/App/Update/UpdateFile.cs
+++ b/mRemoteV1/App/Update/UpdateFile.cs
@@ -27,6 +27,9 @@ namespace mRemoteNG.App.Update
             char[] keyValueSeparators = { ':', '=' };
             char[] commentCharacters = { '#', ';', '\'' };
 
+            // no separators means no valid update data...
+            if (content.Trim().IndexOfAny(keyValueSeparators) == -1) return;
+
             using (var sr = new StringReader(content))
             {
                 string line;
@@ -43,6 +46,10 @@ namespace mRemoteNG.App.Update
                     if (parts.Length != 2)
                         continue;
 
+                    // make sure we have valid data in both parts before adding to the collection. If either part is empty, then it's not valid data.
+                    if(string.IsNullOrEmpty(parts[0].Trim()) || string.IsNullOrEmpty(parts[1].Trim()))
+                        continue;
+
                     Items.Add(parts[0].Trim(), parts[1].Trim());
                 }
             }
diff --git a/mRemoteV1/Properties/AssemblyInfo.cs b/mRemoteV1/Properties/AssemblyInfo.cs
index 263bd9277..c47c0a4df 100644
--- a/mRemoteV1/Properties/AssemblyInfo.cs
+++ b/mRemoteV1/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // <Assembly: AssemblyVersion("1.0.*")>
 
-[assembly: AssemblyVersion("1.75.7005.*")]
+[assembly: AssemblyVersion("1.75.7006.*")]
 
 [assembly:NeutralResourcesLanguageAttribute("en")]
 
diff --git a/mRemoteV1/Resources/PuTTYNG.exe b/mRemoteV1/Resources/PuTTYNG.exe
index 0d9c7fc32..789a4725c 100644
Binary files a/mRemoteV1/Resources/PuTTYNG.exe and b/mRemoteV1/Resources/PuTTYNG.exe differ
diff --git a/mRemoteV1/Tools/NotificationAreaIcon.cs b/mRemoteV1/Tools/NotificationAreaIcon.cs
index cd66a8554..8bfe2d73a 100644
--- a/mRemoteV1/Tools/NotificationAreaIcon.cs
+++ b/mRemoteV1/Tools/NotificationAreaIcon.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Connection;
+using mRemoteNG.Container;
 using mRemoteNG.UI.Forms;
 
 
@@ -114,7 +115,7 @@ namespace mRemoteNG.Tools
         private void ConMenItem_MouseUp(object sender, MouseEventArgs e)
         {
             if (e.Button != MouseButtons.Left) return;
-            if (!(((ToolStripMenuItem) sender).Tag is ConnectionInfo)) return;
+            if (((ToolStripMenuItem)sender).Tag is ContainerInfo) return;
             if (frmMain.Default.Visible == false)
                 ShowForm();
             _connectionInitiator.OpenConnection((ConnectionInfo) ((ToolStripMenuItem) sender).Tag);