diff --git a/src/groups/mqb/mqbblp/mqbblp_storagemanager.cpp b/src/groups/mqb/mqbblp/mqbblp_storagemanager.cpp
index ebdbff631..44b3c4356 100644
--- a/src/groups/mqb/mqbblp/mqbblp_storagemanager.cpp
+++ b/src/groups/mqb/mqbblp/mqbblp_storagemanager.cpp
@@ -1341,7 +1341,7 @@ int StorageManager::start(bsl::ostream& errorDescription)
                        << ") exceeds the protocol limit ("
                        << mqbs::FileStoreProtocol::k_MAX_DATA_FILE_SIZE_HARD
                        << ")";
-        return rc_OVERFLOW_MAX_DATA_FILE_SIZE;
+        return rc_OVERFLOW_MAX_DATA_FILE_SIZE;  // RETURN
     }
 
     if (mqbs::FileStoreProtocol::k_MAX_JOURNAL_FILE_SIZE_HARD <
@@ -1351,7 +1351,7 @@ int StorageManager::start(bsl::ostream& errorDescription)
                        << ") exceeds the protocol limit ("
                        << mqbs::FileStoreProtocol::k_MAX_JOURNAL_FILE_SIZE_HARD
                        << ")";
-        return rc_OVERFLOW_MAX_JOURNAL_FILE_SIZE;
+        return rc_OVERFLOW_MAX_JOURNAL_FILE_SIZE;  // RETURN
     }
 
     if (mqbs::FileStoreProtocol::k_MAX_QLIST_FILE_SIZE_HARD <
@@ -1361,7 +1361,7 @@ int StorageManager::start(bsl::ostream& errorDescription)
                        << ") exceeds the protocol limit ("
                        << mqbs::FileStoreProtocol::k_MAX_QLIST_FILE_SIZE_HARD
                        << ")";
-        return rc_OVERFLOW_MAX_QLIST_FILE_SIZE;
+        return rc_OVERFLOW_MAX_QLIST_FILE_SIZE;  // RETURN
     }
 
     int rc = mqbc::StorageUtil::validatePartitionDirectory(partitionCfg,
diff --git a/src/groups/mqb/mqbc/mqbc_storagemanager.cpp b/src/groups/mqb/mqbc/mqbc_storagemanager.cpp
index d2b2771be..a45a3bbfc 100644
--- a/src/groups/mqb/mqbc/mqbc_storagemanager.cpp
+++ b/src/groups/mqb/mqbc/mqbc_storagemanager.cpp
@@ -3487,7 +3487,7 @@ int StorageManager::start(bsl::ostream& errorDescription)
                        << ") exceeds the protocol limit ("
                        << mqbs::FileStoreProtocol::k_MAX_DATA_FILE_SIZE_HARD
                        << ")";
-        return rc_OVERFLOW_MAX_DATA_FILE_SIZE;
+        return rc_OVERFLOW_MAX_DATA_FILE_SIZE;  // RETURN
     }
 
     if (mqbs::FileStoreProtocol::k_MAX_JOURNAL_FILE_SIZE_HARD <
@@ -3497,7 +3497,7 @@ int StorageManager::start(bsl::ostream& errorDescription)
                        << ") exceeds the protocol limit ("
                        << mqbs::FileStoreProtocol::k_MAX_JOURNAL_FILE_SIZE_HARD
                        << ")";
-        return rc_OVERFLOW_MAX_JOURNAL_FILE_SIZE;
+        return rc_OVERFLOW_MAX_JOURNAL_FILE_SIZE;  // RETURN
     }
 
     if (mqbs::FileStoreProtocol::k_MAX_QLIST_FILE_SIZE_HARD <
@@ -3507,7 +3507,7 @@ int StorageManager::start(bsl::ostream& errorDescription)
                        << ") exceeds the protocol limit ("
                        << mqbs::FileStoreProtocol::k_MAX_QLIST_FILE_SIZE_HARD
                        << ")";
-        return rc_OVERFLOW_MAX_QLIST_FILE_SIZE;
+        return rc_OVERFLOW_MAX_QLIST_FILE_SIZE;  // RETURN
     }
 
     int rc = StorageUtil::validatePartitionDirectory(partitionCfg,