diff --git a/Modules/EMCAL/src/FECRateVisualization.cxx b/Modules/EMCAL/src/FECRateVisualization.cxx
index 5633065a11..667668b441 100644
--- a/Modules/EMCAL/src/FECRateVisualization.cxx
+++ b/Modules/EMCAL/src/FECRateVisualization.cxx
@@ -69,7 +69,7 @@ void FECRateVisualization::update(Trigger t, framework::ServiceRegistryRef servi
 
   auto& qcdb = services.get<quality_control::repository::DatabaseInterface>();
   auto mo = qcdb.retrieveMO("EMC/MO/CellTrendingDetailEMCAL", "CellTrendingDetailEMCAL", t.timestamp, t.activity);
-  TTree* datatree = static_cast<TTree*>(mo->getObject());
+  TTree* datatree = mo ? static_cast<TTree*>(mo->getObject()) : nullptr;
   if (!datatree) {
     ILOG(Error, Support) << "Tree not found" << ENDM;
     return;
diff --git a/Modules/ITS/src/TrendingTaskITSCluster.cxx b/Modules/ITS/src/TrendingTaskITSCluster.cxx
index e2178754ac..886f99126c 100644
--- a/Modules/ITS/src/TrendingTaskITSCluster.cxx
+++ b/Modules/ITS/src/TrendingTaskITSCluster.cxx
@@ -102,8 +102,9 @@ void TrendingTaskITSCluster::trendValues(const Trigger& t, repository::DatabaseI
     if (dataSource.type == "repository") {
       // auto mo = qcdb.retrieveMO(dataSource.path, dataSource.name);
       auto mo = qcdb.retrieveMO(dataSource.path, "", t.timestamp, t.activity);
-      if (mo == nullptr)
+      if (mo == nullptr) {
         continue;
+      }
       if (!count) {
         std::map<std::string, std::string> entryMetadata = mo->getMetadataMap();  // full list of metadata as a map
         mMetaData.runNumber = std::stoi(entryMetadata[metadata_keys::runNumber]); // get and set run number
diff --git a/Modules/ITS/src/TrendingTaskITSError.cxx b/Modules/ITS/src/TrendingTaskITSError.cxx
index 0d4ddb2fce..c5e07cef7c 100644
--- a/Modules/ITS/src/TrendingTaskITSError.cxx
+++ b/Modules/ITS/src/TrendingTaskITSError.cxx
@@ -113,8 +113,9 @@ void TrendingTaskITSError::trendValues(const Trigger& t, repository::DatabaseInt
     // cast to whatever it needs.
     if (dataSource.type == "repository") {
       auto mo = qcdb.retrieveMO(dataSource.path, dataSource.name, t.timestamp, t.activity);
-      if (mo == nullptr)
+      if (mo == nullptr) {
         continue;
+      }
       if (!count) {
         std::map<std::string, std::string> entryMetadata = mo->getMetadataMap();  // full list of metadata as a map
         mMetaData.runNumber = std::stoi(entryMetadata[metadata_keys::runNumber]); // get and set run number
diff --git a/Modules/ITS/src/TrendingTaskITSFEE.cxx b/Modules/ITS/src/TrendingTaskITSFEE.cxx
index d097bd3688..a122f61514 100644
--- a/Modules/ITS/src/TrendingTaskITSFEE.cxx
+++ b/Modules/ITS/src/TrendingTaskITSFEE.cxx
@@ -106,8 +106,9 @@ void TrendingTaskITSFEE::trendValues(const Trigger& t, repository::DatabaseInter
     // cast to whatever it needs.
     if (dataSource.type == "repository") {
       auto mo = qcdb.retrieveMO(dataSource.path, dataSource.name, t.timestamp, t.activity);
-      if (mo == nullptr)
+      if (mo == nullptr) {
         continue;
+      }
       if (!count) {
         std::map<std::string, std::string> entryMetadata = mo->getMetadataMap();  // full list of metadata as a map
         mMetaData.runNumber = std::stoi(entryMetadata[metadata_keys::runNumber]); // get and set run number
diff --git a/Modules/ITS/src/TrendingTaskITSFhr.cxx b/Modules/ITS/src/TrendingTaskITSFhr.cxx
index a0d7d06b77..7d21aea2d1 100644
--- a/Modules/ITS/src/TrendingTaskITSFhr.cxx
+++ b/Modules/ITS/src/TrendingTaskITSFhr.cxx
@@ -120,8 +120,9 @@ void TrendingTaskITSFhr::trendValues(const Trigger& t, repository::DatabaseInter
 
       // auto mo = qcdb.retrieveMO(dataSource.path, dataSource.name);
       auto mo = qcdb.retrieveMO(dataSource.path, "", timestamp, t.activity);
-      if (mo == nullptr)
+      if (mo == nullptr) {
         continue;
+      }
       if (!count) {
         std::map<std::string, std::string> entryMetadata = mo->getMetadataMap();  // full list of metadata as a map
         mMetaData.runNumber = std::stoi(entryMetadata[metadata_keys::runNumber]); // get and set run number
diff --git a/Modules/ITS/src/TrendingTaskITSThr.cxx b/Modules/ITS/src/TrendingTaskITSThr.cxx
index 87d515dd68..f4132d67f2 100644
--- a/Modules/ITS/src/TrendingTaskITSThr.cxx
+++ b/Modules/ITS/src/TrendingTaskITSThr.cxx
@@ -104,8 +104,9 @@ void TrendingTaskITSThr::trendValues(const Trigger& t, repository::DatabaseInter
     if (dataSource.type == "repository") {
       // auto mo = qcdb.retrieveMO(dataSource.path, dataSource.name);
       auto mo = qcdb.retrieveMO(dataSource.path, "", t.timestamp, t.activity);
-      if (mo == nullptr)
+      if (mo == nullptr) {
         continue;
+      }
       if (!count) {
         std::map<std::string, std::string> entryMetadata = mo->getMetadataMap();  // full list of metadata as a map
         mMetaData.runNumber = std::stoi(entryMetadata[metadata_keys::runNumber]); // get and set run number
diff --git a/Modules/ITS/src/TrendingTaskITSTracks.cxx b/Modules/ITS/src/TrendingTaskITSTracks.cxx
index 7463feafe2..b7b7775310 100644
--- a/Modules/ITS/src/TrendingTaskITSTracks.cxx
+++ b/Modules/ITS/src/TrendingTaskITSTracks.cxx
@@ -100,8 +100,9 @@ void TrendingTaskITSTracks::trendValues(const Trigger& t, repository::DatabaseIn
     if (dataSource.type == "repository") {
       // auto mo = qcdb.retrieveMO(dataSource.path, dataSource.name);
       auto mo = qcdb.retrieveMO(dataSource.path, "", t.timestamp, t.activity);
-      if (mo == nullptr)
+      if (mo == nullptr) {
         continue;
+      }
       if (!count) {
         std::map<std::string, std::string> entryMetadata = mo->getMetadataMap();  // full list of metadata as a map
         mMetaData.runNumber = std::stoi(entryMetadata[metadata_keys::runNumber]); // get and set run number