diff --git a/SeamlessClient.cs b/SeamlessClient.cs
index 6464c9b..4414a5e 100644
--- a/SeamlessClient.cs
+++ b/SeamlessClient.cs
@@ -108,6 +108,9 @@ namespace SeamlessClientPlugin
 
 
         public static string Version = "1.2.10";
+        public static bool Debug = true;
+
+
         private bool Initilized = false;
         private bool SentPingResponse = false;
         public const ushort SeamlessClientNetID = 2936;
@@ -241,8 +244,8 @@ namespace SeamlessClientPlugin
 
         public static void TryShow(string message)
         {
-           // if (MySession.Static?.LocalHumanPlayer != null)
-                //MyAPIGateway.Utilities?.ShowMessage("NetworkClient", message);
+            if (MySession.Static?.LocalHumanPlayer != null && Debug)
+                MyAPIGateway.Utilities?.ShowMessage("NetworkClient", message);
 
             MyLog.Default?.WriteLineAndConsole($"SeamlessClient: {message}");
         }
diff --git a/SeamlessTransfer/LoadServer.cs b/SeamlessTransfer/LoadServer.cs
index 05b0f63..736b5e2 100644
--- a/SeamlessTransfer/LoadServer.cs
+++ b/SeamlessTransfer/LoadServer.cs
@@ -470,7 +470,6 @@ namespace SeamlessClientPlugin.SeamlessTransfer
                 }catch(Exception ex)
                 {
                     SeamlessClient.TryShow(ex.ToString());
-
                 }
 
 
diff --git a/SeamlessTransfer/Transfer.cs b/SeamlessTransfer/Transfer.cs
index d6b6743..3ad75fd 100644
--- a/SeamlessTransfer/Transfer.cs
+++ b/SeamlessTransfer/Transfer.cs
@@ -127,7 +127,24 @@ namespace SeamlessClientPlugin.SeamlessTransfer
             if (MyMultiplayer.Static != null)
             {
                 MyHud.Chat.UnregisterChat(MyMultiplayer.Static);
-                
+
+
+                try
+                {
+                    //Could throw error when there are no gps points
+                    var PCollection = MySession.Static.Gpss[MySession.Static.LocalPlayerId];
+                    PCollection?.Clear();
+                    SeamlessClient.TryShow(PCollection.Count + "registered GPS points");
+                }
+                catch(Exception ex)
+                {
+                    SeamlessClient.TryShow(ex.ToString());
+                }
+
+
+                MyHud.GpsMarkers.Clear();
+
+
                 MyMultiplayer.Static.ReplicationLayer.Disconnect();
                 MyMultiplayer.Static.ReplicationLayer.Dispose();
 
@@ -136,13 +153,10 @@ namespace SeamlessClientPlugin.SeamlessTransfer
 
                 //Sync.Clients.Clear();
 
-
-                var PCollection = MySession.Static.Gpss[MySession.Static.LocalPlayerId];
-                PCollection.Clear();
-                MyHud.GpsMarkers.Clear();
+                
                 
 
-                SeamlessClient.TryShow(PCollection.Count + "registered GPS points");
+                
                 // MyGuiSandbox.UnloadContent();
             }
         }