diff --git a/src/ntf/ntfimcnd/ntfimcn_imm.c b/src/ntf/ntfimcnd/ntfimcn_imm.c
index 8376c45b9..5264605d4 100644
--- a/src/ntf/ntfimcnd/ntfimcn_imm.c
+++ b/src/ntf/ntfimcnd/ntfimcn_imm.c
@@ -233,6 +233,11 @@ error:
 	 *       returning from this function. Not done here because of
 	 *       osafassert()
 	 */
+	// [Lennart] This is not good log level handling
+	// If NOT_EXIST use LOG_NO and improve the error message e.g.
+	// LOG_NO("%s: Failed with error %s", __FUNCTION__, saf_error(rc));
+	// For other errors LOG_ER could be used. In both cases imcn_exit
+	// can be used
 	LOG_ER("%s Failed", __FUNCTION__);
 	LOG_NO("osafntfimcnd restarting due to an error.");
 	imcn_exit(EXIT_FAILURE);
@@ -943,6 +948,10 @@ static bool initializeImmOmHandle(SaImmHandleT* immOmHandle) {
 		    continue;
 		else
 		    break;
+		// [Lennart] The following lines is dead code
+		// Both lines must be done before calling saImmOmInitialize()
+		// again. Shall be executed just before continue above (in both
+		// places)
 		osaf_nanosleep(&delay_ts);
 		imm_version = kImmVersion;
 	}