diff --git a/src/log/agent/lga_mds.cc b/src/log/agent/lga_mds.cc
index 374cb59a0..39c3d3bfa 100644
--- a/src/log/agent/lga_mds.cc
+++ b/src/log/agent/lga_mds.cc
@@ -325,6 +325,8 @@ static uint32_t lga_enc_write_ntf_header(NCS_UBAID *uba,
                                          const SaLogNtfLogHeaderT *ntfLogH) {
   uint8_t *p8;
   uint32_t total_bytes = 0, bytes;
+  [Lennart] variable "bytes" should be initialized here even if it is
+  initialized later in the if statement
 
   p8 = ncs_enc_reserve_space(uba, 12);
   if (!p8) {
@@ -339,6 +341,8 @@ static uint32_t lga_enc_write_ntf_header(NCS_UBAID *uba,
 
   // Encode notificationObject
   if ((bytes = encodeSaNameT(uba, p8, ntfLogH->notificationObject)) == 0) {
+    [Lennart] Try to avoid if statements that does other things than boolean
+    comparing, in this case assigning a value to a varible
     return 0;
   }
   total_bytes += bytes;