diff --git a/shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs b/shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
index f3d088c5..08125e92 100644
--- a/shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
+++ b/shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
@@ -6,8 +6,8 @@ using System.Net.NetworkInformation;
 using System.Threading;
 using Shadowsocks.Model;
 using System.Reflection;
-using Shadowsocks.Util;
-
+using Shadowsocks.Util;
+
 namespace Shadowsocks.Controller
 {
     class AvailabilityStatistics
@@ -81,6 +81,7 @@ namespace Shadowsocks.Controller
                     }
                     catch (Exception e)
                     {
+                        Console.WriteLine($"An exception occured when eveluating {server.FriendlyName()}");
                         Logging.LogUsefulException(e);
                     }
                 }
diff --git a/shadowsocks-csharp/View/ConfigForm.cs b/shadowsocks-csharp/View/ConfigForm.cs
index d7d5c1f3..dc290249 100755
--- a/shadowsocks-csharp/View/ConfigForm.cs
+++ b/shadowsocks-csharp/View/ConfigForm.cs
@@ -146,6 +146,28 @@ namespace Shadowsocks.View
 
         }
 
+        private void ConfigForm_KeyDown(object sender, KeyEventArgs e)
+        {
+            // Sometimes the users may hit enter key by mistake, and the form will close without saving entries.
+
+            if (e.KeyCode == Keys.Enter)
+            {
+                Server server = controller.GetCurrentServer();
+                if (!SaveOldSelectedServer())
+                {
+                    return;
+                }
+                if (_modifiedConfiguration.configs.Count == 0)
+                {
+                    MessageBox.Show(I18N.GetString("Please add at least one server"));
+                    return;
+                }
+                controller.SaveServers(_modifiedConfiguration.configs, _modifiedConfiguration.localPort);
+                controller.SelectServerIndex(_modifiedConfiguration.configs.IndexOf(server));
+            }
+
+        }
+
         private void ServersListBox_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (!ServersListBox.CanSelect)