diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
index 0366464a3..13fc1f9c6 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
@@ -127,25 +127,27 @@ namespace TBF.BenchControl.DataEntry.Munich3
 				if (modelessDlg is CycleBeginningForm)
 				{
 					CycleBeginningForm dlg = (modelessDlg as CycleBeginningForm);
-                
-					if (dlg.WaterMetersCount > 0 && waterMeters[0] != null) waterMeters[0].SerialNr = dlg.SNText[0];
-					if (dlg.WaterMetersCount > 1 && waterMeters[1] != null) waterMeters[1].SerialNr = dlg.SNText[1];
-					if (dlg.WaterMetersCount > 2 && waterMeters[2] != null) waterMeters[2].SerialNr = dlg.SNText[2];
-					if (dlg.WaterMetersCount > 3 && waterMeters[3] != null) waterMeters[3].SerialNr = dlg.SNText[3];
-					if (dlg.WaterMetersCount > 4 && waterMeters[4] != null) waterMeters[4].SerialNr = dlg.SNText[4];
-					if (dlg.WaterMetersCount > 5 && waterMeters[5] != null) waterMeters[5].SerialNr = dlg.SNText[5];
+					int count = Math.Min(dlg.WaterMetersCount, waterMeters.Count);
+
+					if (count > 0 && waterMeters[0] != null) waterMeters[0].SerialNr = dlg.SNText[0];
+					if (count > 1 && waterMeters[1] != null) waterMeters[1].SerialNr = dlg.SNText[1];
+					if (count > 2 && waterMeters[2] != null) waterMeters[2].SerialNr = dlg.SNText[2];
+					if (count > 3 && waterMeters[3] != null) waterMeters[3].SerialNr = dlg.SNText[3];
+					if (count > 4 && waterMeters[4] != null) waterMeters[4].SerialNr = dlg.SNText[4];
+					if (count > 5 && waterMeters[5] != null) waterMeters[5].SerialNr = dlg.SNText[5];
 				}
 				else if (modelessDlg is CycleEndForm)
 				{
 					CycleEndForm dlg = (modelessDlg as CycleEndForm);
-
+					int count = Math.Min(dlg.WaterMetersCount, waterMeters.Count);
 					protocolTitle = dlg.ProtocolTitle;
-					if (dlg.WaterMetersCount > 0 && waterMeters[0] != null) waterMeters[0].EndState = dlg.EndStateText[0];
-					if (dlg.WaterMetersCount > 1 && waterMeters[1] != null) waterMeters[1].EndState = dlg.EndStateText[1];
-					if (dlg.WaterMetersCount > 2 && waterMeters[2] != null) waterMeters[2].EndState = dlg.EndStateText[2];
-					if (dlg.WaterMetersCount > 3 && waterMeters[3] != null) waterMeters[3].EndState = dlg.EndStateText[3];
-					if (dlg.WaterMetersCount > 4 && waterMeters[4] != null) waterMeters[4].EndState = dlg.EndStateText[4];
-					if (dlg.WaterMetersCount > 5 && waterMeters[5] != null) waterMeters[5].EndState = dlg.EndStateText[5];
+
+					if (count > 0 && waterMeters[0] != null) waterMeters[0].EndState = dlg.EndStateText[0];
+					if (count > 1 && waterMeters[1] != null) waterMeters[1].EndState = dlg.EndStateText[1];
+					if (count > 2 && waterMeters[2] != null) waterMeters[2].EndState = dlg.EndStateText[2];
+					if (count > 3 && waterMeters[3] != null) waterMeters[3].EndState = dlg.EndStateText[3];
+					if (count > 4 && waterMeters[4] != null) waterMeters[4].EndState = dlg.EndStateText[4];
+					if (count > 5 && waterMeters[5] != null) waterMeters[5].EndState = dlg.EndStateText[5];
 				}
 				resultSaved = true;
 			}
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 7c6c50e11..ba63b4db4 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -199,9 +199,12 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                 {
                     BenchControl.Elde.FixedStartRegisterReader.RegisterReader registerReader =
                         sensPath.RegisterReaders[i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
-                    registerReader.BeginWMState = dataEntryCmpnt.WMState(i);
-                    registerReader.EndWMState = dataEntryCmpnt.WMState(i);
-                    tstRslt.Meters[i].VolumeStart = dataEntryCmpnt.WMState(i) / registerReader.PulsesPerLtr;  /// liter
+					if (registerReader != null)
+					{
+						registerReader.BeginWMState = dataEntryCmpnt.WMState(i);
+						registerReader.EndWMState = dataEntryCmpnt.WMState(i);
+						tstRslt.Meters[i].VolumeStart = dataEntryCmpnt.WMState(i) / registerReader.PulsesPerLtr;  /// liter
+					}
                 }
             }