Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs
===================================================================
diff -u -r8658d36cc32a7af5ea898721e85abe5985b52fb1 -rc975510c82744319cf957dc0018d7abb847ae95b
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs	(.../AssemblyToolHelper.cs)	(revision 8658d36cc32a7af5ea898721e85abe5985b52fb1)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs	(.../AssemblyToolHelper.cs)	(revision c975510c82744319cf957dc0018d7abb847ae95b)
@@ -96,7 +96,7 @@
 
             if (!failureMechanism.InAssembly)
             {
-                return double.NaN;
+                return 0;
             }
 
             FailurePathAssemblyResult assemblyResult = failureMechanism.AssemblyResult;
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs
===================================================================
diff -u -r9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba -rc975510c82744319cf957dc0018d7abb847ae95b
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs	(.../AssemblyToolHelperTest.cs)	(revision 9729d89fdb3e2c36bb9ce59da81cc0b03bc81cba)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs	(.../AssemblyToolHelperTest.cs)	(revision c975510c82744319cf957dc0018d7abb847ae95b)
@@ -128,7 +128,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanism_WithFailureInAssemblyFalse_ReturnsNaN()
+        public void AssembleFailureMechanism_WithFailureInAssemblyFalse_ReturnsZero()
         {
             // Setup
             var random = new Random(21);
@@ -144,7 +144,7 @@
                 failurePath, sr => null, random.NextDouble());
 
             // Assert
-            Assert.IsNaN(assemblyResult);
+            Assert.AreEqual(0, assemblyResult);
             mocks.VerifyAll();
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs
===================================================================
diff -u -r62ca51b8ff808cf657e915c7307946cab9f973be -rc975510c82744319cf957dc0018d7abb847ae95b
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs	(.../AssemblyResultTotalViewTest.cs)	(revision 62ca51b8ff808cf657e915c7307946cab9f973be)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs	(.../AssemblyResultTotalViewTest.cs)	(revision c975510c82744319cf957dc0018d7abb847ae95b)
@@ -444,7 +444,7 @@
                 // Then
                 Assert.AreNotSame(dataSource, dataGridView.DataSource);
                 Assert.AreEqual(view.AssessmentSection.GetFailureMechanisms().Count(), rows.Count);
-                AssertAssemblyCells(view.AssessmentSection.Piping, double.NaN, rows[0].Cells);
+                AssertAssemblyCells(view.AssessmentSection.Piping, 0, rows[0].Cells);
             }
         }