Index: sources/model/hd/data/MTreatmentRangesData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/MTreatmentRangesData.cpp	(.../MTreatmentRangesData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/MTreatmentRangesData.cpp	(.../MTreatmentRangesData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -29,19 +29,19 @@
 
 bool MTreatmentRanges::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mDuration_Min              ))
-    if (GetValue(vByteArray, index, _data.mDuration_Max              ))
-    if (GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Min))
-    if (GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Max))
-    if (GetValue(vByteArray, index, _data.mDialysate_Flow_Min        ))
-    if (GetValue(vByteArray, index, _data.mDialysate_Flow_Max        ))
-        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; }
+    if ( ! GetValue(vByteArray, index, _data.mDuration_Min              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDuration_Max              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Min)) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Max)) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysate_Flow_Min        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysate_Flow_Max        )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!