Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs
===================================================================
diff -u -r00e1ec8175bfef74547ef4f206d80b44d73484c7 -rb0483be937a9995e4c424e4d1fa8a9aa97258657
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs	(.../AssemblyErrorMessageCreator.cs)	(revision 00e1ec8175bfef74547ef4f206d80b44d73484c7)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs	(.../AssemblyErrorMessageCreator.cs)	(revision b0483be937a9995e4c424e4d1fa8a9aa97258657)
@@ -89,6 +89,7 @@
                 case EAssemblyErrors.LowerLimitIsAboveUpperLimit:
                     return Resources.AssemblyErrorMessageCreator_LowerLimitIsAboveUpperLimit;
                 case EAssemblyErrors.ValueMayNotBeNull:
+                case EAssemblyErrors.ValueMayNotBeNaN:
                     return Resources.AssemblyErrorMessageCreator_ValueMayNotBeNull;
                 case EAssemblyErrors.FailurePathSectionLengthInvalid:
                     return Resources.AssemblyErrorMessageCreator_FailurePathSectionLengthInvalid;
@@ -112,6 +113,8 @@
                     return Resources.AssemblyErrorMessageCreator_EmptyResultsList;
                 case EAssemblyErrors.ProfileProbabilityGreaterThanSectionProbability:
                     return Resources.AssemblyErrorMessageCreator_ProfileProbabilityGreaterThanSectionProbability;
+                case EAssemblyErrors.ErrorConstructingErrorMessage:
+                    return Resources.AssemblyErrorMessageCreator_ErrorConstructingErrorMessage;
                 default:
                     throw new NotSupportedException();
             }
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.Designer.cs
===================================================================
diff -u -r00e1ec8175bfef74547ef4f206d80b44d73484c7 -rb0483be937a9995e4c424e4d1fa8a9aa97258657
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 00e1ec8175bfef74547ef4f206d80b44d73484c7)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b0483be937a9995e4c424e4d1fa8a9aa97258657)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. All rights reserved.
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
 //
 // This file is part of Riskeer.
 //
@@ -145,6 +145,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Er is een onverwachte fout opgetreden..
+        /// </summary>
+        internal static string AssemblyErrorMessageCreator_ErrorConstructingErrorMessage {
+            get {
+                return ResourceManager.GetString("AssemblyErrorMessageCreator_ErrorConstructingErrorMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Gezamenlijke lengte van alle deelvakken moet gelijk zijn aan de trajectlengte..
         /// </summary>
         internal static string AssemblyErrorMessageCreator_FailurePathSectionLengthInvalid {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.resx
===================================================================
diff -u -r00e1ec8175bfef74547ef4f206d80b44d73484c7 -rb0483be937a9995e4c424e4d1fa8a9aa97258657
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.resx	(.../Resources.resx)	(revision 00e1ec8175bfef74547ef4f206d80b44d73484c7)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.resx	(.../Resources.resx)	(revision b0483be937a9995e4c424e4d1fa8a9aa97258657)
@@ -201,4 +201,7 @@
   <data name="AssemblyErrorMessageCreator_ProfileProbabilityGreaterThanSectionProbability" xml:space="preserve">
     <value>De faalkans per vak moet groter of gelijk zijn aan de faalkans per doorsnede.</value>
   </data>
+  <data name="AssemblyErrorMessageCreator_ErrorConstructingErrorMessage" xml:space="preserve">
+    <value>Er is een onverwachte fout opgetreden.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs
===================================================================
diff -u -rc749eeafa503e1be4f886f01d64ad35f09bd748b -rb0483be937a9995e4c424e4d1fa8a9aa97258657
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs	(.../AssemblyErrorMessageCreatorTest.cs)	(revision c749eeafa503e1be4f886f01d64ad35f09bd748b)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs	(.../AssemblyErrorMessageCreatorTest.cs)	(revision b0483be937a9995e4c424e4d1fa8a9aa97258657)
@@ -74,6 +74,8 @@
         [TestCase(EAssemblyErrors.InvalidCategoryLimits, "De categoriegrenzen zijn niet aaneengesloten en spannen niet de volldige faalskansruimte.")]
         [TestCase(EAssemblyErrors.EmptyResultsList, "Er ontbreekt invoer voor de assemblage rekenmodule waardoor de assemblage niet uitgevoerd kan worden.")]
         [TestCase(EAssemblyErrors.ProfileProbabilityGreaterThanSectionProbability, "De faalkans per vak moet groter of gelijk zijn aan de faalkans per doorsnede.")]
+        [TestCase(EAssemblyErrors.ValueMayNotBeNaN, "Er is ongeldige invoer gedefinieerd voor de gebruikte methode.")]
+        [TestCase(EAssemblyErrors.ErrorConstructingErrorMessage, "Er is een onverwachte fout opgetreden.")]
         public void CreateErrorMessage_SingleAssemblyError_ReturnsExpectedErrorMessage(EAssemblyErrors assemblyError, string expectedErrorMessage)
         {
             // Call