Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/FailureMechanismPlaceholderContextProperties.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/FailureMechanismPlaceholderContextProperties.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/FailureMechanismPlaceholderContextProperties.cs	(revision 4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e)
@@ -0,0 +1,41 @@
+using Core.Common.Gui.Attributes;
+using Core.Common.Gui.PropertyBag;
+using Core.Common.Utils.Attributes;
+using Ringtoets.Integration.Forms.PresentationObjects;
+
+namespace Ringtoets.Integration.Forms.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="FailureMechanismPlaceholderContext"/> properties panel.
+    /// </summary>
+    public class FailureMechanismPlaceholderContextProperties : ObjectProperties<FailureMechanismPlaceholderContext> {
+
+        #region General
+
+        [PropertyOrder(1)]
+        [ResourcesCategory(typeof(Common.Data.Properties.Resources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Common.Data.Properties.Resources), "FailureMechanism_Name_DisplayName")]
+        [ResourcesDescription(typeof(Common.Data.Properties.Resources), "FailureMechanism_Name_Description")]
+        public string Name
+        {
+            get
+            {
+                return data.WrappedData.Name;
+            }
+        }
+
+        [PropertyOrder(2)]
+        [ResourcesCategory(typeof(Common.Data.Properties.Resources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Common.Data.Properties.Resources), "FailureMechanism_Code_DisplayName")]
+        [ResourcesDescription(typeof(Common.Data.Properties.Resources), "FailureMechanism_Code_Description")]
+        public string Code
+        {
+            get
+            {
+                return data.WrappedData.Code;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r684b8c0ca681ea2da3cc988bd60e9223037e5a16 -r4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 684b8c0ca681ea2da3cc988bd60e9223037e5a16)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e)
@@ -47,6 +47,7 @@
     <Compile Include="MapDataFactory.cs" />
     <Compile Include="PresentationObjects\FailureMechanismPlaceholderContext.cs" />
     <Compile Include="PresentationObjects\HydraulicBoundaryDatabaseContext.cs" />
+    <Compile Include="PropertyClasses\FailureMechanismPlaceholderContextProperties.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryLocationProperties.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r36b6f1f7c1ddf585689512eb61256d41a1e0ca64 -r4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 36b6f1f7c1ddf585689512eb61256d41a1e0ca64)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e)
@@ -105,6 +105,7 @@
         {
             yield return new PropertyInfo<IAssessmentSection, AssessmentSectionProperties>();
             yield return new PropertyInfo<HydraulicBoundaryDatabaseContext, HydraulicBoundaryDatabaseProperties>();
+            yield return new PropertyInfo<FailureMechanismPlaceholderContext, FailureMechanismPlaceholderContextProperties>();
         }
 
         /// <summary>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismPlaceholderContextPropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismPlaceholderContextPropertiesTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismPlaceholderContextPropertiesTest.cs	(revision 4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e)
@@ -0,0 +1,41 @@
+using Core.Common.Gui.PropertyBag;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Integration.Data.Placeholders;
+using Ringtoets.Integration.Forms.PresentationObjects;
+using Ringtoets.Integration.Forms.PropertyClasses;
+
+namespace Ringtoets.Integration.Forms.Test.PropertyClasses
+{
+    [TestFixture]
+    public class FailureMechanismPlaceholderContextPropertiesTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+
+            // Call
+            var properties = new FailureMechanismPlaceholderContextProperties();
+
+            // Assert
+            Assert.IsInstanceOf<ObjectProperties<FailureMechanismPlaceholderContext>>(properties);
+        }
+
+        [Test]
+        public void Data_SetNewPipingFailureMechanismContextInstance_ReturnCorrectPropertyValues()
+        {
+            // Setup
+            var failureMechanism = new FailureMechanismPlaceholder("testName", "testCode");
+            var properties = new FailureMechanismPlaceholderContextProperties();
+
+            // Call
+            properties.Data = new FailureMechanismPlaceholderContext(failureMechanism, new MockRepository().StrictMock<IAssessmentSection>());
+
+            // Assert
+            Assert.AreEqual(failureMechanism.Name, properties.Name);
+            Assert.AreEqual(failureMechanism.Code, properties.Code);
+        } 
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r8efe7a79774f6a946a58c45f052c975d43304fb3 -r4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 8efe7a79774f6a946a58c45f052c975d43304fb3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e)
@@ -61,6 +61,7 @@
     <Compile Include="MapDataFactoryTest.cs" />
     <Compile Include="PresentationObjects\FailureMechanismPlaceholderContextTest.cs" />
     <Compile Include="PresentationObjects\HydraulicBoundaryDatabaseContextTest.cs" />
+    <Compile Include="PropertyClasses\FailureMechanismPlaceholderContextPropertiesTest.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryLocationPropertiesTest.cs" />
     <Compile Include="PropertyClasses\HydraulicBoundaryDatabasePropertiesTest.cs" />
     <Compile Include="TreeNodeInfos\AssessmentSectionTreeNodeInfoTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs
===================================================================
diff -u -r3abef5ccb0ba5386c65d4156b319970fc4337a29 -r4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 3abef5ccb0ba5386c65d4156b319970fc4337a29)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs	(.../RingtoetsGuiPluginTest.cs)	(revision 4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e)
@@ -181,19 +181,25 @@
                 PropertyInfo[] propertyInfos = guiPlugin.GetPropertyInfos().ToArray();
 
                 // Assert
-                Assert.AreEqual(2, propertyInfos.Length);
+                Assert.AreEqual(3, propertyInfos.Length);
 
                 var assessmentSectionProperties = propertyInfos.Single(pi => pi.DataType == typeof(IAssessmentSection));
                 Assert.AreEqual(typeof(AssessmentSectionProperties), assessmentSectionProperties.PropertyObjectType);
                 Assert.IsNull(assessmentSectionProperties.AdditionalDataCheck);
                 Assert.IsNull(assessmentSectionProperties.GetObjectPropertiesData);
                 Assert.IsNull(assessmentSectionProperties.AfterCreate);
 
-                var hydraulicBoundaryDatabase = propertyInfos.Single(pi => pi.DataType == typeof(HydraulicBoundaryDatabaseContext));
-                Assert.AreEqual(typeof(HydraulicBoundaryDatabaseProperties), hydraulicBoundaryDatabase.PropertyObjectType);
-                Assert.IsNull(hydraulicBoundaryDatabase.AdditionalDataCheck);
-                Assert.IsNull(hydraulicBoundaryDatabase.GetObjectPropertiesData);
-                Assert.IsNull(hydraulicBoundaryDatabase.AfterCreate);
+                var hydraulicBoundaryDatabaseProperties = propertyInfos.Single(pi => pi.DataType == typeof(HydraulicBoundaryDatabaseContext));
+                Assert.AreEqual(typeof(HydraulicBoundaryDatabaseProperties), hydraulicBoundaryDatabaseProperties.PropertyObjectType);
+                Assert.IsNull(hydraulicBoundaryDatabaseProperties.AdditionalDataCheck);
+                Assert.IsNull(hydraulicBoundaryDatabaseProperties.GetObjectPropertiesData);
+                Assert.IsNull(hydraulicBoundaryDatabaseProperties.AfterCreate);
+
+                var failureMechanismPlaceholderProperties = propertyInfos.Single(pi => pi.DataType == typeof(FailureMechanismPlaceholderContext));
+                Assert.AreEqual(typeof(FailureMechanismPlaceholderContextProperties), failureMechanismPlaceholderProperties.PropertyObjectType);
+                Assert.IsNull(failureMechanismPlaceholderProperties.AdditionalDataCheck);
+                Assert.IsNull(failureMechanismPlaceholderProperties.GetObjectPropertiesData);
+                Assert.IsNull(failureMechanismPlaceholderProperties.AfterCreate);
             }
         }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs
===================================================================
diff -u -r77158a296743c3b3457336706fdbea047daf4886 -r4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs	(.../PipingFailureMechanismContextProperties.cs)	(revision 77158a296743c3b3457336706fdbea047daf4886)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs	(.../PipingFailureMechanismContextProperties.cs)	(revision 4c81f998de5bd6df7e7c3119f75e1dd37c09ee2e)
@@ -2,14 +2,13 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 
-using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.Properties;
 
 namespace Ringtoets.Piping.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of <see cref="GeneralPipingInput"/> for properties panel.
+    /// ViewModel of <see cref="PipingFailureMechanismContext"/> properties panel.
     /// </summary>
     public class PipingFailureMechanismContextProperties : ObjectProperties<PipingFailureMechanismContext>
     {