diff --git a/cookbooks/aws-parallelcluster-computefleet/files/clusterstatusmgtd/clusterstatusmgtd.py b/cookbooks/aws-parallelcluster-computefleet/files/clusterstatusmgtd/clusterstatusmgtd.py
index 8067f1fc88..12a3beca0d 100644
--- a/cookbooks/aws-parallelcluster-computefleet/files/clusterstatusmgtd/clusterstatusmgtd.py
+++ b/cookbooks/aws-parallelcluster-computefleet/files/clusterstatusmgtd/clusterstatusmgtd.py
@@ -77,6 +77,7 @@ def wrapper_log_expection(*args, **kwargs):  # pylint: disable=R1710
                     if exception_to_raise:
                         raise exception_to_raise
                     raise
+                return None
 
         return wrapper_log_expection
 
diff --git a/cookbooks/aws-parallelcluster-environment/files/cloudwatch/cloudwatch_agent_config_util.py b/cookbooks/aws-parallelcluster-environment/files/cloudwatch/cloudwatch_agent_config_util.py
index bc0fcb3bde..c51093a53f 100644
--- a/cookbooks/aws-parallelcluster-environment/files/cloudwatch/cloudwatch_agent_config_util.py
+++ b/cookbooks/aws-parallelcluster-environment/files/cloudwatch/cloudwatch_agent_config_util.py
@@ -158,6 +158,7 @@ def remove_backup():
     try:
         os.remove(LOG_CONFIGS_BAK_PATH)
     except FileNotFoundError:
+        # No need to remove the file, as the file isn't found anyway
         pass