Index: sources/model/hd/alarm/MAlarmCleared.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r720d1051f9f5fef2d82f3878454550e9e2c5ca92
--- sources/model/hd/alarm/MAlarmCleared.cpp	(.../MAlarmCleared.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/alarm/MAlarmCleared.cpp	(.../MAlarmCleared.cpp)	(revision 720d1051f9f5fef2d82f3878454550e9e2c5ca92)
@@ -24,9 +24,14 @@
 
 bool MAlarmCleared::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAlarmID))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
+    if (GetValue(vByteArray, index, _data.mAlarmID)) goto lError;
+
+    return true ;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+
+    return false ;
 }
 
 /*!