Index: sources/model/hd/alarm/MAlarmStatusData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r6fa5fe90d8bf6fa25d3ee54d8aba8bcaaa053ee0
--- sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision 6fa5fe90d8bf6fa25d3ee54d8aba8bcaaa053ee0)
@@ -29,18 +29,17 @@
 
 bool MAlarmStatus::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mState       ))
-    if (GetValue(vByteArray, index, _data.mTop         ))
-    if (GetValue(vByteArray, index, _data.mEscalatesIn ))
-    if (GetValue(vByteArray, index, _data.mMuteTimeout ))
-    if (GetBits (vByteArray, index, _data.mFlags       , GuiAlarmFlags::NUM_OF_ALARM_STATE_FLAG_BIT_POS)) {
-        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.mState       )                                                 )  goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTop         )                                                 )  goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mEscalatesIn )                                                 )  goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMuteTimeout )                                                 )  goto lError;
+    if ( ! GetBits (vByteArray, index, _data.mFlags       ,GuiAlarmFlags::NUM_OF_ALARM_STATE_FLAG_BIT_POS)  )  goto lError;
+
+    return true;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+        return false;
 }
 
 /*!