diff --git a/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs b/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs
index 81e173b..b7a9b18 100644
--- a/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs
+++ b/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs
@@ -74,7 +74,13 @@ namespace ErgometerApplication
                     if (SerialPort.GetPortNames().Length > 0)
                     {
                         string error = "";
-                        bool connect = MainClient.Connect(SerialPort.GetPortNames()[0], username, password, out error);
+                        bool connect = false;
+                        foreach(string comport in SerialPort.GetPortNames())
+                        {
+                            connect = MainClient.Connect(comport, username, password, out error);
+                            if (connect)
+                                break;
+                        }
 
                         if (connect)
                         {
diff --git a/ErgometerIPR/ErgometerLibrary/ComPort.cs b/ErgometerIPR/ErgometerLibrary/ComPort.cs
index 126fc39..5233fa8 100644
--- a/ErgometerIPR/ErgometerLibrary/ComPort.cs
+++ b/ErgometerIPR/ErgometerLibrary/ComPort.cs
@@ -24,7 +24,8 @@ namespace ErgometerLibrary
             comPort.Parity = Parity.None;
             comPort.StopBits = StopBits.One;
             comPort.BaudRate = 9600;
-            comPort.ReadTimeout = 1500;
+            comPort.ReadTimeout = 200;
+            comPort.WriteTimeout = 350;
             try {
                 comPort.Open();
             }
@@ -54,7 +55,15 @@ namespace ErgometerLibrary
         {
             if (IsOpen())
             {
-                comPort.WriteLine(input);
+                
+                try
+                {
+                    comPort.WriteLine(input);
+                }
+                catch (TimeoutException)
+                {
+                  
+                }
             }
         }