Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismSectionCollection.cs
===================================================================
diff -u -r4b2daa16b6b210d5d5c9a5f8f2a10a610add4eb1 -rd507de965210c6af40d57936780fa55b05430e13
--- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismSectionCollection.cs	(.../FailureMechanismSectionCollection.cs)	(revision 4b2daa16b6b210d5d5c9a5f8f2a10a610add4eb1)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismSectionCollection.cs	(.../FailureMechanismSectionCollection.cs)	(revision d507de965210c6af40d57936780fa55b05430e13)
@@ -29,7 +29,7 @@
 
 namespace Ringtoets.Common.Data.FailureMechanism
 {
-    public class FailureMechanismSectionCollection : Observable, IObservableEnumerable<FailureMechanismSection>
+    public class FailureMechanismSectionCollection : Observable, IEnumerable<FailureMechanismSection>
     {
         private readonly List<FailureMechanismSection> sections = new List<FailureMechanismSection>();
 
@@ -76,19 +76,23 @@
 
             Clear();
 
-            List<FailureMechanismSection> sourceCollection = failureMechanismSections.ToList();
-            if (!sourceCollection.Any())
+            if (failureMechanismSections.Any())
             {
-                return;
-            }
+                FailureMechanismSection firstSection = failureMechanismSections.First();
+                var newSections = new List<FailureMechanismSection>
+                {
+                    firstSection
+                };
 
-            FailureMechanismSection firstSection = sourceCollection.First();
-            sections.Add(firstSection);
-            sourceCollection.Remove(firstSection);
+                FailureMechanismSection previousSection = firstSection;
+                foreach (FailureMechanismSection section in failureMechanismSections.Skip(1))
+                {
+                    ValidateSection(section, previousSection);
+                    newSections.Add(section);
+                    previousSection = section;
+                }
 
-            foreach (FailureMechanismSection section in sourceCollection)
-            {
-                InsertSectionWhileMaintainingConnectivityOrder(section);
+                sections.AddRange(newSections);
             }
 
             SourcePath = sourcePath;
@@ -105,24 +109,21 @@
         }
 
         /// <summary>
-        /// Inserts the section to the collection while maintaining connectivity
-        /// order (neighboring <see cref="FailureMechanismSection"/> have same end points).
+        /// Validates the section on its connectivity order (neighboring
+        /// <see cref="FailureMechanismSection"/> must have same end points).
         /// </summary>
-        /// <param name="sectionToInsert">The new section.</param>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="sectionToInsert"/> cannot
-        /// be connected to elements already defined in this collection.</exception>
-        private void InsertSectionWhileMaintainingConnectivityOrder(FailureMechanismSection sectionToInsert)
+        /// <param name="section">The new section.</param>
+        /// <param name="previousSection">The previous section.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="section"/> cannot
+        /// be connected to the previous section.</exception>
+        private static void ValidateSection(FailureMechanismSection section, FailureMechanismSection previousSection)
         {
-            if (sections.Last().EndPoint.Equals(sectionToInsert.StartPoint))
+            if (!previousSection.EndPoint.Equals(section.StartPoint))
             {
-                sections.Add(sectionToInsert);
+                string message = string.Format(Resources.FailureMechanismSectionCollection_ValidateSection_Section_0_must_connect_to_existing_sections,
+                                               section.Name);
+                throw new ArgumentException(message, nameof(section));
             }
-            else
-            {
-                string message = string.Format(Resources.BaseFailureMechanism_AddSection_Section_0_must_connect_to_existing_sections,
-                                               sectionToInsert.Name);
-                throw new ArgumentException(message, nameof(sectionToInsert));
-            }
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r42750c3eeb3410d3cd559ac0cb1a899efbaa1659 -rd507de965210c6af40d57936780fa55b05430e13
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 42750c3eeb3410d3cd559ac0cb1a899efbaa1659)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d507de965210c6af40d57936780fa55b05430e13)
@@ -164,15 +164,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Vak &apos;{0}&apos; sluit niet aan op de al gedefinieerde vakken van het toetsspoor..
-        /// </summary>
-        public static string BaseFailureMechanism_AddSection_Section_0_must_connect_to_existing_sections {
-            get {
-                return ResourceManager.GetString("BaseFailureMechanism_AddSection_Section_0_must_connect_to_existing_sections", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Caisson.
         /// </summary>
         public static string BreakWaterType_Caisson_DisplayName {
@@ -547,6 +538,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Vak &apos;{0}&apos; sluit niet aan op de al gedefinieerde vakken van het toetsspoor..
+        /// </summary>
+        public static string FailureMechanismSectionCollection_ValidateSection_Section_0_must_connect_to_existing_sections {
+            get {
+                return ResourceManager.GetString("FailureMechanismSectionCollection_ValidateSection_Section_0_must_connect_to_exist" +
+                        "ing_sections", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De waarde voor de faalkans moet in het bereik {0} liggen..
         /// </summary>
         public static string FailureProbability_Value_needs_to_be_in_Range_0_ {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -r42750c3eeb3410d3cd559ac0cb1a899efbaa1659 -rd507de965210c6af40d57936780fa55b05430e13
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 42750c3eeb3410d3cd559ac0cb1a899efbaa1659)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision d507de965210c6af40d57936780fa55b05430e13)
@@ -126,7 +126,7 @@
   <data name="ReferenceLine_SetGeometry_New_geometry_has_null_coordinate" xml:space="preserve">
     <value>Een punt in de geometrie voor de referentielijn heeft geen waarde.</value>
   </data>
-  <data name="BaseFailureMechanism_AddSection_Section_0_must_connect_to_existing_sections" xml:space="preserve">
+  <data name="FailureMechanismSectionCollection_ValidateSection_Section_0_must_connect_to_existing_sections" xml:space="preserve">
     <value>Vak '{0}' sluit niet aan op de al gedefinieerde vakken van het toetsspoor.</value>
   </data>
   <data name="FailureMechanismSection_Section_must_have_at_least_1_geometry_point" xml:space="preserve">
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismSectionCollectionTest.cs
===================================================================
diff -u -r4b2daa16b6b210d5d5c9a5f8f2a10a610add4eb1 -rd507de965210c6af40d57936780fa55b05430e13
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismSectionCollectionTest.cs	(.../FailureMechanismSectionCollectionTest.cs)	(revision 4b2daa16b6b210d5d5c9a5f8f2a10a610add4eb1)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismSectionCollectionTest.cs	(.../FailureMechanismSectionCollectionTest.cs)	(revision d507de965210c6af40d57936780fa55b05430e13)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
@@ -40,7 +41,7 @@
             var sectionCollection = new FailureMechanismSectionCollection();
 
             // Assert
-            Assert.IsInstanceOf<IObservableEnumerable<FailureMechanismSection>>(sectionCollection);
+            Assert.IsInstanceOf<IEnumerable<FailureMechanismSection>>(sectionCollection);
             Assert.IsInstanceOf<Observable>(sectionCollection);
             Assert.IsNull(sectionCollection.SourcePath);
             CollectionAssert.IsEmpty(sectionCollection);
@@ -108,7 +109,7 @@
         }
 
         [Test]
-        public void SetSections_SecondSectionEndConnectingToStartOfFirst_ThrowArgumentException()
+        public void SetSections_SecondSectionEndConnectingToStartOfFirst_ThrowsArgumentExceptionAndDoesNotSetSections()
         {
             // Setup
             var sectionCollection = new FailureMechanismSectionCollection();
@@ -137,10 +138,12 @@
             // Assert
             const string expectedMessage = "Vak 'B' sluit niet aan op de al gedefinieerde vakken van het toetsspoor.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+            CollectionAssert.IsEmpty(sectionCollection);
+            Assert.IsNull(sectionCollection.SourcePath);
         }
 
         [Test]
-        public void SetSections_SecondSectionDoesNotConnectToFirst_ThrowArgumentException()
+        public void SetSections_SecondSectionDoesNotConnectToFirst_ThrowsArgumentExceptionAndDoesNotSetSections()
         {
             // Setup
             var sectionCollection = new FailureMechanismSectionCollection();
@@ -166,6 +169,8 @@
             // Assert
             const string expectedMessage = "Vak 'B' sluit niet aan op de al gedefinieerde vakken van het toetsspoor.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+            CollectionAssert.IsEmpty(sectionCollection);
+            Assert.IsNull(sectionCollection.SourcePath);
         }
 
         [Test]
@@ -204,5 +209,20 @@
             }, sectionCollection);
             Assert.AreEqual(sourcePath, sectionCollection.SourcePath);
         }
+
+        [Test]
+        public void SetSections_WithEmptySectionCollection_SourcePathSet()
+        {
+            // Setup
+            string sourcePath = TestHelper.GetScratchPadPath();
+            var sectionCollection = new FailureMechanismSectionCollection();
+
+            // Call
+            sectionCollection.SetSections(Enumerable.Empty<FailureMechanismSection>(), sourcePath);
+
+            // Assert
+            CollectionAssert.IsEmpty(sectionCollection);
+            Assert.AreEqual(sourcePath, sectionCollection.SourcePath);
+        }
     }
 }
\ No newline at end of file