Index: sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp	(.../MTreatmentLogAvrgeData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp	(.../MTreatmentLogAvrgeData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -31,17 +31,18 @@
 
 bool MTreatmentLogAvrgeData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mBloodFlowRate    ))
-    if (GetValue(vByteArray, index, _data.mDialysateFlowRate))
-    if (GetValue(vByteArray, index, _data.mUFRate           ))
-    if (GetValue(vByteArray, index, _data.mArterialPressure ))
-    if (GetValue(vByteArray, index, _data.mVenousPressure   ))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mBloodFlowRate    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate)) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUFRate           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mArterialPressure )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousPressure   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!