Index: sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp	(.../MTreatmentLogAlarmData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp	(.../MTreatmentLogAlarmData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -29,13 +29,16 @@
 
 bool MTreatmentLogAlarmData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAlarmID  ))
-    if (GetValue(vByteArray, index, _data.mParam1   ))
-    if (GetValue(vByteArray, index, _data.mParam2   ))
-        return true ;
-    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.mAlarmID  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mParam1   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mParam2   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!