diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedIssueNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedIssueNoteEventHandler.cs
index f4e63fbd0..4582d59a6 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedIssueNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedIssueNoteEventHandler.cs
@@ -22,7 +22,7 @@ public class UnplannedIssueNoteEventHandler
     {
         var entity = eventData.Entity;
 
-        if(entity.Details.Count > 0)
+        if(entity.Details!=null && entity.Details.Count > 0)
         {
             await AddExchangeDataAsync(entity).ConfigureAwait(false);
         }
@@ -36,7 +36,7 @@ public class UnplannedIssueNoteEventHandler
         List<UnplannedIssueNote> notelist = new List<UnplannedIssueNote>();
         foreach (var entity in entities)
         {
-            if (entity.Details.Count > 0)
+            if (entity.Details != null && entity.Details.Count > 0)
             {
                 notelist.Add(entity);
             }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs
index e48588536..b07618a38 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs
@@ -20,14 +20,30 @@ public class UnplannedReceiptNoteEventHandler
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<UnplannedReceiptNote> eventData)
     {
         var entity = eventData.Entity;
-        await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        if(entity.Details!=null && entity.Details.Count>0)
+        {
+            await AddExchangeDataAsync(entity).ConfigureAwait(false);
+        }
+
+        
     }
 
     [UnitOfWork]
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<UnplannedReceiptNote>> eventData)
     {
         var entities = eventData.Entity;
-        await AddExchangeDataAsync(entities).ConfigureAwait(false);
+
+        List<UnplannedReceiptNote> notelist = new List<UnplannedReceiptNote>();
+        foreach (var entity in entities)
+        {
+            if (entity.Details != null && entity.Details.Count > 0)
+            {
+                notelist.Add(entity);
+            }
+        }
+
+
+        await AddExchangeDataAsync(notelist).ConfigureAwait(false);
     }
 
     protected override async Task AddExchangeDataAsync(List<UnplannedReceiptNote> entities)