Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -59,34 +59,23 @@
                 Order = order
             };
 
-            CreateDesignWaterLevelOutput(entity, location.DesignWaterLevelOutput);
-            CreateWaveHeightOutput(entity, location.WaveHeightOutput);
+            CreateHydraulicLocationOutput(entity, location.DesignWaterLevelOutput, HydraulicLocationOutputType.DesignWaterLevel);
+            CreateHydraulicLocationOutput(entity, location.WaveHeightOutput, HydraulicLocationOutputType.WaveHeight);
 
             registry.Register(entity, location);
             return entity;
         }
 
-        private static void CreateDesignWaterLevelOutput(HydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output)
+        private static void CreateHydraulicLocationOutput(HydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output,
+                                                          HydraulicLocationOutputType outputType)
         {
-            if (output == null)
+            if (output != null)
             {
-                return;
+                entity.HydraulicLocationOutputEntities.Add(output.Create<HydraulicLocationOutputEntity>
+                                                               (outputType));
             }
-            entity.HydraulicLocationOutputEntities.Add(output.Create<HydraulicLocationOutputEntity>
-                                                           (HydraulicLocationOutputType.DesignWaterLevel));
         }
 
-        private static void CreateWaveHeightOutput(HydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output)
-        {
-            if (output == null)
-            {
-                return;
-            }
-
-            entity.HydraulicLocationOutputEntities.Add(output.Create<HydraulicLocationOutputEntity>(
-                HydraulicLocationOutputType.WaveHeight));
-        }
-
         #region Grass CoverErosion Outwards HydraulicLocation
 
         /// <summary>
@@ -118,34 +107,26 @@
                 Order = order
             };
 
-            CreateDesignWaterLevelOutput(entity, location.DesignWaterLevelOutput);
-            CreateWaveHeightOutput(entity, location.WaveHeightOutput);
+            CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.DesignWaterLevelOutput,
+                                                                   HydraulicLocationOutputType.DesignWaterLevel);
+            CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.WaveHeightOutput,
+                                                                   HydraulicLocationOutputType.WaveHeight);
 
             registry.Register(entity, location);
             return entity;
         }
 
-        private static void CreateDesignWaterLevelOutput(GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output)
+        private static void CreateGrassCoverErosionOutwardsHydraulicLocationOutput(GrassCoverErosionOutwardsHydraulicLocationEntity entity,
+                                                                                   HydraulicBoundaryLocationOutput output,
+                                                                                   HydraulicLocationOutputType outputType)
         {
-            if (output == null)
+            if (output != null)
             {
-                return;
+                entity.GrassCoverErosionOutwardsHydraulicLocationOutputEntities.Add(output.Create<GrassCoverErosionOutwardsHydraulicLocationOutputEntity>
+                                                                                        (outputType));
             }
-            entity.GrassCoverErosionOutwardsHydraulicLocationOutputEntities.Add(output.Create<GrassCoverErosionOutwardsHydraulicLocationOutputEntity>(
-                HydraulicLocationOutputType.DesignWaterLevel));
         }
 
-        private static void CreateWaveHeightOutput(GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output)
-        {
-            if (output == null)
-            {
-                return;
-            }
-
-            entity.GrassCoverErosionOutwardsHydraulicLocationOutputEntities.Add(output.Create<GrassCoverErosionOutwardsHydraulicLocationOutputEntity>(
-                HydraulicLocationOutputType.WaveHeight));
-        }
-
         #endregion
     }
 }
\ No newline at end of file