Index: sources/model/hd/data/treatment/MTreatmentStatesData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -33,27 +33,23 @@
 
 bool MTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mSubMode              ))
-    if (GetValue(vByteArray, index, _data.mUFState              ))
-    if (GetValue(vByteArray, index, _data.mSalineState          ))
-    if (GetValue(vByteArray, index, _data.mHeparinState         ))
-    if (GetValue(vByteArray, index, _data.mRinsebackState       ))
-    if (GetValue(vByteArray, index, _data.mRecirculateState     ))
-    if (GetValue(vByteArray, index, _data.mBloodPrimeState      ))
-    if (GetValue(vByteArray, index, _data.mTreatmentEndState    ))
-    if (GetValue(vByteArray, index, _data.mTreatmentStopState   ))
-    if (GetValue(vByteArray, index, _data.mDialysisState        ))
-        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; }
-    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.mSubMode              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUFState              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSalineState          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mHeparinState         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRinsebackState       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRecirculateState     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodPrimeState      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTreatmentEndState    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTreatmentStopState   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysisState        )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!