Index: /trunk/FACT++/src/fadctrl.cc
===================================================================
--- /trunk/FACT++/src/fadctrl.cc	(revision 10823)
+++ /trunk/FACT++/src/fadctrl.cc	(revision 10824)
@@ -206,5 +206,8 @@
     void HandleReadTimeout(const bs::error_code &error)
     {
-        if (error && error!=ba::error::basic_errors::operation_aborted)
+        if (error==ba::error::basic_errors::operation_aborted)
+            return;
+
+        if (error)
         {
             ostringstream str;
@@ -223,7 +226,4 @@
             return;
         }
-
-        if (error==ba::error::basic_errors::operation_aborted)
-            return;
 
         // Check whether the deadline has passed. We compare the deadline
Index: /trunk/FACT++/src/ftmctrl.cc
===================================================================
--- /trunk/FACT++/src/ftmctrl.cc	(revision 10823)
+++ /trunk/FACT++/src/ftmctrl.cc	(revision 10824)
@@ -402,5 +402,8 @@
     void HandleReadTimeout(const bs::error_code &error)
     {
-        if (error && error!=ba::error::basic_errors::operation_aborted)
+        if (error==ba::error::basic_errors::operation_aborted)
+            return;
+
+        if (error)
         {
             ostringstream str;
@@ -419,7 +422,4 @@
             return;
         }
-
-        if (error==ba::error::basic_errors::operation_aborted)
-            return;
 
         // Check whether the deadline has passed. We compare the deadline