Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs
===================================================================
diff -u -r46b7b8c7ae08c83f5a21504d5e1f2f47b33b5e40 -r92598abae0206724835b91b3708e970ae09ac5de
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs	(.../StructuresCalculationCreateExtensions.cs)	(revision 46b7b8c7ae08c83f5a21504d5e1f2f47b33b5e40)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs	(.../StructuresCalculationCreateExtensions.cs)	(revision 92598abae0206724835b91b3708e970ae09ac5de)
@@ -59,12 +59,8 @@
                 Order = order
             };
             SetInputValues(entity, calculation.InputParameters, registry);
+            SetOutputEntity(entity, calculation, registry);
 
-            if (calculation.HasOutput)
-            {
-                entity.HeightStructuresOutputEntities.Add(calculation.Output.Create<HeightStructuresOutputEntity>(registry));
-            }
-
             registry.Register(entity, calculation);
 
             return entity;
@@ -120,6 +116,14 @@
             entity.DeviationWaveDirection = input.DeviationWaveDirection.Value.ToNaNAsNull();
         }
 
+        private static void SetOutputEntity(HeightStructuresCalculationEntity entity, StructuresCalculation<HeightStructuresInput> calculation, PersistenceRegistry registry)
+        {
+            if (calculation.HasOutput)
+            {
+                entity.HeightStructuresOutputEntities.Add(calculation.Output.Create<HeightStructuresOutputEntity>(registry));
+            }
+        }
+
         private static void SetInputValues(ClosingStructuresCalculationEntity entity, ClosingStructuresInput input, PersistenceRegistry registry)
         {
             input.Create(entity, registry);