diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
index 88ac2b76c..bb1c57f18 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
+++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/Camera.cs
@@ -106,12 +106,6 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
 
 		public void StopDevice()
 		{
-			if (terminalDlg != null)
-			{
-				terminalDlg.CloseDlg();
-				terminalDlg = null;
-			}
-
 			if (Telnet != null)
 			{
 				Telnet.Dispose();
diff --git a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.cs b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.cs
index e85ca6a97..d1ce55b1a 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.cs
+++ b/TestBenchFramework/BenchControl/Network/Camera/CLP1611/TerminalDlg.cs
@@ -35,21 +35,5 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
 		{
 			vtTextBox.Text = args.VtText;
 		}
-
-
-		delegate void CloseDlgDlgt();		/// Delegate of void Fn(void) function
-
-		public void CloseDlg()
-		{
-			if (dlgLoaded)
-			{
-				Invoke(new CloseDlgDlgt(OnCloseDlg));
-			}
-		}
-
-		void OnCloseDlg()
-		{
-			Close();
-		}
 	}
 }
diff --git a/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs
index 24d2673c5..961372940 100644
--- a/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs
+++ b/TestBenchFramework/BenchControl/Network/Camera/Roi/Roi.cs
@@ -150,6 +150,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
 			}
 			catch
 			{
+                log.FatalFormat("Roi : UdpListener() thread  failed");
 			}
 		}
 
diff --git a/TestBenchFramework/BenchControl/Network/Telnet/TelnetClient.cs b/TestBenchFramework/BenchControl/Network/Telnet/TelnetClient.cs
index 239242d29..7eb3b4d76 100644
--- a/TestBenchFramework/BenchControl/Network/Telnet/TelnetClient.cs
+++ b/TestBenchFramework/BenchControl/Network/Telnet/TelnetClient.cs
@@ -271,7 +271,7 @@ namespace TBF.BenchControl.Network.Telnet
 
 			Terminate();
 
-			if (!thread.Join(2000)) throw(new Exception("Fatal error"));
+			if (!thread.Join(5000)) throw(new Exception("Fatal error"));
         }
 
         /// <summary>
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 9429db126..841982976 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.12.434.1")]
-[assembly: AssemblyFileVersion("2.12.434.1")]
+[assembly: AssemblyVersion("2.12.435.1")]
+[assembly: AssemblyFileVersion("2.12.435.1")]