diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb
index fe8f34ec..eafdf00c 100644
--- a/ifrs17/Import/Importers.ipynb
+++ b/ifrs17/Import/Importers.ipynb
@@ -464,10 +464,22 @@
                 "\n    var dataNodeSingleParametersUndefined = dataNodesImported.Where(x => x != null &&",
                 "\n                                                                    !dataNodeParametersDefined.Contains(x) && ",
                 "\n                                                                    dataNodesDefined.SingleOrDefault(y => y.SystemName == x) is GroupOfInsuranceContract).ToHashSet();",
-                "\n    await DataSource.UpdateAsync( dataNodeStatesUndefined.Select(x => ",
-                "\n        new DataNodeState {DataNode = x, Year = args.Year, Month = DefaultDataNodeActivationMonth, State = State.Active, Partition = partition.Id}).ToArray() );",
-                "\n    await DataSource.UpdateAsync( dataNodeSingleParametersUndefined.Select(x => ",
-                "\n        new SingleDataNodeParameter {DataNode = x, Year = args.Year, Month = DefaultDataNodeActivationMonth, PremiumAllocation = DefaultPremiumExperienceAdjustmentFactor, Partition = partition.Id}).ToArray() );",
+                "\n    if ((dataNodeStatesUndefined?.Any() ?? false))",
+                "\n        await DataSource.UpdateAsync( dataNodeStatesUndefined.Select(x => ",
+                "\n            new DataNodeState {DataNode = x, ",
+                "\n                            Year = args.Year, ",
+                "\n                            Month = DefaultDataNodeActivationMonth, ",
+                "\n                            State = State.Active, ",
+                "\n                            Partition = partition.Id})",
+                "\n                        .ToArray() );",
+                "\n    if ((dataNodeSingleParametersUndefined?.Any() ?? false))",
+                "\n        await DataSource.UpdateAsync( dataNodeSingleParametersUndefined.Select(x => ",
+                "\n            new SingleDataNodeParameter {DataNode = x, ",
+                "\n                                        Year = args.Year, ",
+                "\n                                        Month = DefaultDataNodeActivationMonth, ",
+                "\n                                        PremiumAllocation = DefaultPremiumExperienceAdjustmentFactor, ",
+                "\n                                        Partition = partition.Id})",
+                "\n                        .ToArray() );",
                 "\n    await DataSource.CommitAsync();",
                 "\n}"
             ],
diff --git a/ifrs17/Utils/ActivityLog.ipynb b/ifrs17/Utils/ActivityLog.ipynb
index 03176664..1342eb57 100644
--- a/ifrs17/Utils/ActivityLog.ipynb
+++ b/ifrs17/Utils/ActivityLog.ipynb
@@ -587,4 +587,4 @@
             "outputs": []
         }
     ]
-}
\ No newline at end of file
+}