diff --git a/src/ClientServer/Config/Constants.cs b/src/ClientServer/Config/Constants.cs
index 49bf7043e0a8321394c2b8049e246899c81a0b5a..fe6888721171c5d5da2daa1cfe65d579088f18b8 100644
--- a/src/ClientServer/Config/Constants.cs
+++ b/src/ClientServer/Config/Constants.cs
@@ -13,7 +13,7 @@ namespace ClientServer.Helpers
     /// </summary>
     public static class Constants
     {
-        public static string VersionString = "2.6.4";
+        public static string VersionString = "2.6.5";
 
         /// <summary>
         /// this is only set once at program.cs!!
diff --git a/src/ClientServer/Helpers/TraceStringHelper.cs b/src/ClientServer/Helpers/TraceStringHelper.cs
index c926002409b06759f303afc446afb07cc7b7ff48..89de30619b2b15bbd728eb4df9c5f3acc5c6c89c 100644
--- a/src/ClientServer/Helpers/TraceStringHelper.cs
+++ b/src/ClientServer/Helpers/TraceStringHelper.cs
@@ -45,7 +45,7 @@ namespace ClientServer.Helpers
         
         public static string GetTraceStringPartFromTests(List<AllTest> tests)
         {
-            return $"tests_{tests.FirstOrDefault()}_{tests.Count}";
+            return $"tests_{tests.FirstOrDefault()?.Id}_{tests.Count}";
         }
     }
 }