diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
index afc2cfab2..05e19ed19 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
@@ -66,8 +66,13 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection
 
                 if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
                 if (e.Contains(Event.UiCmdStop)) { retVal = Event.UiCmdStop; goto stopTest; }
-                if (e.Contains(Event.RegulValveTimeOut)) { retVal = Event.Error; goto stopTest; }
-                if (e.Contains(Event.Next)) goto flow_set;
+				if (e.Contains(Event.RegulValveTimeOut))
+				{
+					Bridge.OnError(this, Strings.Timeout);
+					retVal = Event.Done;
+					goto stopTest;
+				}
+				if (e.Contains(Event.Next)) goto flow_set;
             }
             while (!e.Contains(Event.FlowReached));
 
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
index d7cf2ba59..b4aef94f3 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
@@ -137,8 +137,13 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
 
 				if (e.Contains(Event.OpArgumentError))	 { retVal = Event.OpArgumentError; goto stopTest; }
 				if (e.Contains(Event.UiCmdStop))		 { retVal = Event.UiCmdStop; goto stopTest; }
-				if (e.Contains(Event.RegulValveTimeOut)) { retVal = Event.Error;	 goto stopTest; }
-                if (e.Contains(Event.Next))				 goto flow_set;
+				if (e.Contains(Event.RegulValveTimeOut))
+				{
+					Bridge.OnError(this, Strings.Timeout);
+					retVal = Event.Done;
+					goto stopTest;
+				}
+				if (e.Contains(Event.Next)) goto flow_set;
 			}
 			while (!e.Contains(Event.FlowReached));
 
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
index ec2b84566..8a1274541 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
@@ -149,7 +149,11 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
                 Bridge.OnTestProgress(this, GetTestProgressData(test, tstRslt, false, cBrd, flowSetTime, progress));
 
 				if (e.Contains(Event.UiCmdStop)) goto stop;
-				if (e.Contains(Event.RegulValveTimeOut)) goto error;
+				if (e.Contains(Event.RegulValveTimeOut))
+				{
+					Bridge.OnError(this, Strings.Timeout);
+					goto error;
+				}
 			}
 			while (!e.Contains(Event.FlowReached));
 
@@ -334,8 +338,12 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
                     Bridge.OnTestProgress(this, GetTestProgressData(test, tstRslt, false, cBrd, flowSetTime, progress));
 
                     if (e.Contains(Event.UiCmdStop)) goto stop;
-                    if (e.Contains(Event.RegulValveTimeOut)) goto error;
-                }
+					if (e.Contains(Event.RegulValveTimeOut))
+					{
+						Bridge.OnError(this, Strings.Timeout);
+						goto error;
+					}
+				}
                 while (!e.Contains(Event.FlowReached));
             }
 
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index e018ff50d..68e33dc4c 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -135,8 +135,13 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 
 				if (e.Contains(Event.OpArgumentError))	 { retVal = Event.OpArgumentError; goto stopTest; }
 				if (e.Contains(Event.UiCmdStop))		 { retVal = Event.UiCmdStop; goto stopTest; }
-				if (e.Contains(Event.RegulValveTimeOut)) { retVal = Event.Error;	 goto stopTest; }
-                if (e.Contains(Event.Next))				 goto flow_set;
+				if (e.Contains(Event.RegulValveTimeOut))
+				{
+					Bridge.OnError(this, Strings.Timeout);
+					retVal = Event.Done;
+					goto stopTest;
+				}
+				if (e.Contains(Event.Next)) goto flow_set;
 			}
 			while (!e.Contains(Event.FlowReached));
 
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index 5848336e2..15e42b88e 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -132,8 +132,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 
 				if (e.Contains(Event.OpArgumentError))	 { retVal = Event.OpArgumentError; goto stopTest; }
 				if (e.Contains(Event.UiCmdStop))		 { retVal = Event.UiCmdStop; goto stopTest; }
-				if (e.Contains(Event.RegulValveTimeOut)) { retVal = Event.Error;	 goto stopTest; }
-                if (e.Contains(Event.Next))				 goto flow_set;
+				if (e.Contains(Event.RegulValveTimeOut))
+				{
+					Bridge.OnError(this, Strings.Timeout);
+					retVal = Event.Done;
+					goto stopTest;
+				}
+				if (e.Contains(Event.Next)) goto flow_set;
 			}
 			while (!e.Contains(Event.FlowReached));
 
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
index bd08de237..c850cd279 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
@@ -132,7 +132,12 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
 
 				if (e.Contains(Event.OpArgumentError))	 { retVal = Event.OpArgumentError; goto stopTest; }
 				if (e.Contains(Event.UiCmdStop))		 { retVal = Event.UiCmdStop; goto stopTest; }
-                if (e.Contains(Event.RegulValveTimeOut)) { log.Warn("FlowSetTimeout");  retVal = Event.Error; goto stopTest; }
+                if (e.Contains(Event.RegulValveTimeOut))
+				{
+					Bridge.OnError(this, Strings.Timeout);
+					retVal = Event.Done;
+					goto stopTest;
+				}
                 if (e.Contains(Event.Next))				 goto flow_set;
 			}
 			while (!e.Contains(Event.FlowReached));
diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
index 98429fd6f..df1c6682f 100644
--- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
@@ -132,8 +132,13 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
 
 				if (e.Contains(Event.OpArgumentError))	 { retVal = Event.OpArgumentError; goto stopTest; }
 				if (e.Contains(Event.UiCmdStop))		 { retVal = Event.UiCmdStop; goto stopTest; }
-				if (e.Contains(Event.RegulValveTimeOut)) { retVal = Event.Error;	 goto stopTest; }
-                if (e.Contains(Event.Next))				 goto flow_set;
+				if (e.Contains(Event.RegulValveTimeOut))
+				{
+					Bridge.OnError(this, Strings.Timeout);
+					retVal = Event.Done;
+					goto stopTest;
+				}
+				if (e.Contains(Event.Next)) goto flow_set;
 			}
 			while (!e.Contains(Event.FlowReached));
 
diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs
index 468d93fec..418eb8dee 100644
--- a/TestBenchFramework/Resources/Strings.Designer.cs
+++ b/TestBenchFramework/Resources/Strings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.1
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -2022,9 +2022,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap testFailedImage {
             get {
                 object obj = ResourceManager.GetObject("testFailedImage", resourceCulture);
@@ -2041,9 +2038,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap testNotDoneImage {
             get {
                 object obj = ResourceManager.GetObject("testNotDoneImage", resourceCulture);
@@ -2051,9 +2045,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         internal static System.Drawing.Bitmap testPassedImage {
             get {
                 object obj = ResourceManager.GetObject("testPassedImage", resourceCulture);
@@ -2088,6 +2079,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Timeout.
+        /// </summary>
+        internal static string Timeout {
+            get {
+                return ResourceManager.GetString("Timeout", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Toler. red. [%].
         /// </summary>
diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx
index 2df7d0e52..814742fc3 100644
--- a/TestBenchFramework/Resources/Strings.resx
+++ b/TestBenchFramework/Resources/Strings.resx
@@ -883,4 +883,7 @@
   <data name="Part" xml:space="preserve">
     <value>Part</value>
   </data>
+  <data name="Timeout" xml:space="preserve">
+    <value>Timeout</value>
+  </data>
 </root>
\ No newline at end of file