diff --git a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorr.cs b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorr.cs
index 1daf63629..01f7baf12 100644
--- a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorr.cs
+++ b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorr.cs
@@ -147,13 +147,13 @@ namespace TBF.BenchControl.Output.DB.SaveDiverterCorrections
         void SaveNewCorrections(ISession session, Component dbCmpnt, IComponent runtimeCmpnt, IList<MeasurementCorrection> corrections)
         {
             if (dbCmpnt.Corrections == null) dbCmpnt.Corrections = new List<MeasurementCorrection>();
-            if (runtimeCmpnt.Corrections == null) runtimeCmpnt.Corrections = new List<MeasurementCorrection>();
+            if ((runtimeCmpnt != null) && (runtimeCmpnt.Corrections == null)) runtimeCmpnt.Corrections = new List<MeasurementCorrection>();
 
             foreach (var mc in corrections)
             {
                 mc.RangeIx = 0;
                 dbCmpnt.Corrections.Add(mc);
-                runtimeCmpnt.Corrections.Add(mc);
+                if (runtimeCmpnt != null) runtimeCmpnt.Corrections.Add(mc);
                 session.SaveOrUpdate(mc);
             }
 
diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs
index e30239453..aed5dc7c7 100644
--- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs
+++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs
@@ -146,13 +146,13 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections
         void SaveNewCorrections(ISession session, Component dbCmpnt, IComponent runtimeCmpnt, int rangeIx, IList<MeasurementCorrection> corrections)
         {
             if (dbCmpnt.Corrections == null) dbCmpnt.Corrections = new List<MeasurementCorrection>();
-            if (runtimeCmpnt.Corrections == null) runtimeCmpnt.Corrections = new List<MeasurementCorrection>();
+            if ((runtimeCmpnt != null) && (runtimeCmpnt.Corrections == null)) runtimeCmpnt.Corrections = new List<MeasurementCorrection>();
 
             foreach (var mc in corrections)
             {
                 mc.RangeIx = rangeIx;
                 dbCmpnt.Corrections.Add(mc);
-                runtimeCmpnt.Corrections.Add(mc);
+                if (runtimeCmpnt != null) runtimeCmpnt.Corrections.Add(mc);
                 session.SaveOrUpdate(mc);
             }