diff --git a/ifrs17/Constants/Validations.ipynb b/ifrs17/Constants/Validations.ipynb
index 01788ef5..94f2d623 100644
--- a/ifrs17/Constants/Validations.ipynb
+++ b/ifrs17/Constants/Validations.ipynb
@@ -208,6 +208,7 @@
                 "\n        (nameof(AocConfigurationOrderNotUnique), _)  => $\"Two or more AoC Configurations have the same Order.\",",
                 "\n        (nameof(AccidentYearTypeNotValid), 1)        => $\"The parsed AccidentYear {s[0]} is invalid. Expected Accident Year input of type int.\",",
                 "\n        (nameof(TableNotFound), 1)                   => $\"The import file does not contain table {s[0]}\",",
+                "\n        (nameof(TableNotFound), 2)                   => $\"The import file contains neither table {s[0]} nor {s[1]}\",",
                 "\n",
                 "\n        // Partition",
                 "\n        (nameof(PartitionNotFound), _)               => $\"Partition do not found.\",",
@@ -300,4 +301,4 @@
             "outputs": []
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/ifrs17/Import/Importers.ipynb b/ifrs17/Import/Importers.ipynb
index b90cc121..d15c14ae 100644
--- a/ifrs17/Import/Importers.ipynb
+++ b/ifrs17/Import/Importers.ipynb
@@ -1290,7 +1290,8 @@
                 "\n    Activity.Start();",
                 "\n    var primaryArgs = GetArgsFromMain(dataSet) with {ImportFormat = ImportFormats.DataNodeParameter};",
                 "\n    primaryArgs.ValidateArgsForPeriodAsync(options.TargetDataSource);",
-                "\n    if (!dataSet.Tables.Contains(primaryArgs.ImportFormat)) ApplicationMessage.Log(Error.TableNotFound, primaryArgs.ImportFormat);",
+                "\n    if (!dataSet.Tables.Contains(nameof(SingleDataNodeParameter)) && !dataSet.Tables.Contains(nameof(InterDataNodeParameter))) ",
+                "\n        ApplicationMessage.Log(Error.TableNotFound, nameof(SingleDataNodeParameter), nameof(InterDataNodeParameter));",
                 "\n    if(ApplicationMessage.HasErrors()) return Activity.Finish();",
                 "\n    var workspace = Workspace.CreateNew();",
                 "\n    workspace.Initialize(x => x.FromSource(options.TargetDataSource).DisableInitialization<RawVariable>().DisableInitialization<IfrsVariable>());",