Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewComboBoxItemWrapper.cs
===================================================================
diff -u -rb389b4d34dab98838a8c2f087b18cfdac544f01f -r112a4274ab494057ed0a24f5f9c2e1ec3ce3cea8
--- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewComboBoxItemWrapper.cs	(.../DataGridViewComboBoxItemWrapper.cs)	(revision b389b4d34dab98838a8c2f087b18cfdac544f01f)
+++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewComboBoxItemWrapper.cs	(.../DataGridViewComboBoxItemWrapper.cs)	(revision 112a4274ab494057ed0a24f5f9c2e1ec3ce3cea8)
@@ -101,5 +101,10 @@
         {
             return EqualityComparer<T>.Default.GetHashCode(wrappedObject);
         }
+
+        public override string ToString()
+        {
+            return DisplayName;
+        }
     }
 }
Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs
===================================================================
diff -u -rb389b4d34dab98838a8c2f087b18cfdac544f01f -r112a4274ab494057ed0a24f5f9c2e1ec3ce3cea8
--- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs	(.../DataGridViewComboBoxItemWrapperTest.cs)	(revision b389b4d34dab98838a8c2f087b18cfdac544f01f)
+++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewComboBoxItemWrapperTest.cs	(.../DataGridViewComboBoxItemWrapperTest.cs)	(revision 112a4274ab494057ed0a24f5f9c2e1ec3ce3cea8)
@@ -16,6 +16,7 @@
             var dataGridViewComboBoxItemWrapper = new DataGridViewComboBoxItemWrapper<TestClass>(testClass);
 
             // Assert
+            Assert.AreEqual("Test class", dataGridViewComboBoxItemWrapper.ToString());
             Assert.AreEqual("Test class", dataGridViewComboBoxItemWrapper.DisplayName);
             Assert.AreEqual(testClass, dataGridViewComboBoxItemWrapper.WrappedObject);
             Assert.AreEqual(dataGridViewComboBoxItemWrapper, dataGridViewComboBoxItemWrapper.This);
@@ -31,6 +32,7 @@
             var dataGridViewComboBoxItemWrapper = new DataGridViewComboBoxItemWrapper<TestClass>(null);
 
             // Assert
+            Assert.AreEqual(Properties.Resources.DataGridViewComboBoxItemWrapper_DisplayName_None, dataGridViewComboBoxItemWrapper.ToString());
             Assert.AreEqual(Properties.Resources.DataGridViewComboBoxItemWrapper_DisplayName_None, dataGridViewComboBoxItemWrapper.DisplayName);
             Assert.IsNull(dataGridViewComboBoxItemWrapper.WrappedObject);
             Assert.AreEqual(dataGridViewComboBoxItemWrapper, dataGridViewComboBoxItemWrapper.This);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -r4e8d24a03bda23a2c393b76c95da11f3c8df5e4d -r112a4274ab494057ed0a24f5f9c2e1ec3ce3cea8
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 4e8d24a03bda23a2c393b76c95da11f3c8df5e4d)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 112a4274ab494057ed0a24f5f9c2e1ec3ce3cea8)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
+using Ringtoets.HydraRing.Data;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Views;
 
@@ -36,6 +37,7 @@
     public class PipingCalculationsViewTest
     {
         private Form testForm;
+        private const int hydraulicBoundaryLocationColumnIndex = 2;
 
         [SetUp]
         public void Setup()
@@ -92,7 +94,7 @@
         }
 
         [Test]
-        public void Dispose_ViewWithAdditionalPropertiesSet_AdditionalPropertiesSetToNull()
+        public void Dispose_PipingCalculationViewWithAdditionalPropertiesSet_AdditionalPropertiesSetToNull()
         {
             // Setup
             var mocks = new MockRepository();
@@ -121,6 +123,37 @@
             Assert.IsNull(pipingCalculationsView.ApplicationSelection);
         }
 
+        [Test]
+        public void AssessmentSection_PipingCalculationView_HydraulicBoundaryLocationsComboboxCorrectlyInitialized()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.StrictMock<AssessmentSectionBase>();
+            var hydraulicBoundaryDatabase = mocks.StrictMock<HydraulicBoundaryDatabase>();
+
+            assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
+            hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "Location 1", 1.1, 2.2));
+            hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "Location 2", 3.3, 4.4));
+
+            // Call
+            var pipingCalculationsView = new PipingCalculationsView
+            {
+                AssessmentSection = assessmentSection
+            };
+
+            ShowPipingCalculationsView(pipingCalculationsView);
+
+            // Assert
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var hydraulicBoundaryLocationCombobox = (DataGridViewComboBoxColumn) dataGridView.Columns[hydraulicBoundaryLocationColumnIndex];
+
+            var comboBoxItems = hydraulicBoundaryLocationCombobox.Items;
+            Assert.AreEqual(3, comboBoxItems.Count);
+            Assert.AreEqual("<geen>", comboBoxItems[0].ToString());
+            Assert.AreEqual("Location 1", comboBoxItems[1].ToString());
+            Assert.AreEqual("Location 2", comboBoxItems[2].ToString());
+        }
+
         private void ShowPipingCalculationsView(PipingCalculationsView pipingCalculationsView)
         {
             testForm.Controls.Add(pipingCalculationsView);