diff --git a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorView.razor.cs b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorView.razor.cs
index b3e523c00..b869518ec 100644
--- a/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorView.razor.cs
+++ b/src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataSelectorView.razor.cs
@@ -81,7 +81,13 @@ protected override async Task OnInitializedAsync()
                     if (DistributedVM.AllExchangesHasTheSameId())
                     {
                         var id = (DistributedVM.MainExchange.DataExchangeTwinObject as IAxoDataEntity)._EntityId.Cyclic;
-                        this.SelectedEntity = DistributedVM.MainExchange.GetRecords(id, 1, 0, eSearchMode.Exact, "", false).First();
+
+                        var recs = DistributedVM.MainExchange.GetRecords(id, 1, 0, eSearchMode.Exact, "", false);
+
+                        if (recs != null && recs.Any())
+                        {
+                            this.SelectedEntity = recs.First();
+                        }
                     }
 
                     ConfigSuffix = string.IsNullOrEmpty(ConfigSuffix) ? string.Empty : ConfigSuffix;
diff --git a/src/data/src/AXOpen.Data/DataPersistentExchange/AxoDataPersistentExchange.cs b/src/data/src/AXOpen.Data/DataPersistentExchange/AxoDataPersistentExchange.cs
index 94166db33..7c6c9601d 100644
--- a/src/data/src/AXOpen.Data/DataPersistentExchange/AxoDataPersistentExchange.cs
+++ b/src/data/src/AXOpen.Data/DataPersistentExchange/AxoDataPersistentExchange.cs
@@ -92,6 +92,8 @@ private async Task<bool> WriteTags(List<ITwinPrimitive> primitives)
         /// <returns>Returns true if the write operation is successful; otherwise, false.</returns>
         public async Task<bool> WritePersistentGroupFromRepository(string group)
         {
+            if (!tagsInGroups.ContainsKey(group)) return false; // group not exist 
+
             var recordFromRepo = _Repository.Read(group);
 
             List<ITwinPrimitive> tagsToWrite = new List<ITwinPrimitive>();
@@ -153,10 +155,11 @@ public async Task<bool> UpdatePersistentGroupFromPlcToRepository(string persiste
 
         private bool UpdateReadedTagsToRepository(string persistentGroupName)
         {
+            if (!tagsInGroups.ContainsKey(persistentGroupName)) return false; // group not exist 
+
             var primitivesTagsInGroup = tagsInGroups[persistentGroupName];
 
-            if (primitivesTagsInGroup == null)
-                return false;
+            if (primitivesTagsInGroup == null) return false;
 
             List<TagObject> NewTagValues = new List<TagObject>();