diff --git a/Calorimeter/CaloEvent/src/CaloCellContainer.cxx b/Calorimeter/CaloEvent/src/CaloCellContainer.cxx
index 889754c2fe303950398add055e439bab8b4de85e..d04c6ecf2e720d238c943bebf2bb6ae572ed4b26 100644
--- a/Calorimeter/CaloEvent/src/CaloCellContainer.cxx
+++ b/Calorimeter/CaloEvent/src/CaloCellContainer.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 //--------------------------------------------------------------
@@ -539,6 +539,7 @@ void CaloCellContainer::orderWhenIncomplete()
     }
 
     // May be less, if there were duplicates.
+    // cppcheck-suppress assertWithSideEffect
     assert (itout <= end());
     resize (itout - begin());
   }
@@ -598,11 +599,7 @@ const CxxUtils::PackedArray& CaloCellContainer::getLookUpTable() const
       // If the cells are sorted, we can look at the last cell to know
       // the maximum hash we're dealing with.  Otherwise, set it to the
       // maximum cell hash value.
-      if (ncells == 0) {
-        // Special case --- don't do anything for an empty container.
-        theSize = 0;
-      }
-      else if (isOrdered()) {
+      if (isOrdered()) {
         // Set LUT size from the hash of the last cell.
         theSize = back()->caloDDE()->calo_hash()+1;
       }
diff --git a/Calorimeter/CaloEvent/src/CaloTester.cxx b/Calorimeter/CaloEvent/src/CaloTester.cxx
index 4fab261a27b1bc264ac6a45df20f33bacbb46242..67d31bdcc0b86de403f29cdd7104ac84b0babae7 100644
--- a/Calorimeter/CaloEvent/src/CaloTester.cxx
+++ b/Calorimeter/CaloEvent/src/CaloTester.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
-/*
- */
 /**
  * @file CaloEvent/src/CaloTester.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -26,9 +24,9 @@
  *        is called.
  */
 CaloTester::CaloTester()
+  : m_mgr_up (std::make_unique<CaloDetDescrManager>())
 {
   // Make a manager instance.
-  m_mgr_up = std::make_unique<CaloDetDescrManager>();
   m_mgr = m_mgr_up.get();
   m_mgr->set_helper (&m_helpers.caloID());
   m_mgr->initialize();