diff --git a/tangostationcontrol/tangostationcontrol/toolkit/archiver.py b/tangostationcontrol/tangostationcontrol/toolkit/archiver.py
index cea9a016a36c1ae2c037716d7817727ee587000e..37401844aea243a9489167d84f42a20f57ae2db2 100644
--- a/tangostationcontrol/tangostationcontrol/toolkit/archiver.py
+++ b/tangostationcontrol/tangostationcontrol/toolkit/archiver.py
@@ -72,7 +72,7 @@ class Archiver():
                 raise Exception(f"Configuration Manager {cm_name} is in FAULT state")
         except Exception as e:
             raise Exception(f"Connection failed with Configuration Manager {cm_name}") from e
-        self.es_list = [es_name for es_name in self.get_subscribers(from_db=False)] or []
+        self.es_list = [es_name for es_name in self.get_subscribers(from_db=False)]
         self.cm.write_attribute('Context',context)    # Set default Context Archiving for all the subscribers
         self.selector = Selector() if selector_filename is None else Selector(selector_filename)  # Create selector for customized strategies
         try:
@@ -383,7 +383,7 @@ class Archiver():
         errs_dict = self.get_subscriber_errors()
         for e in errs_dict:
             if attribute_name in e:
-                return errs_dict.get(e)
+                return errs_dict[e]
         return None
     
     def get_subscriber_load(self,use_freq:bool=True,es_name:str = None):
@@ -422,7 +422,7 @@ class Archiver():
             freq_dict = {a: r for a,r in zip(es.AttributeList,es.AttributeRecordFreqList)}
             for f in freq_dict:
                 if attribute_name.lower() in f:
-                    return freq_dict.get(f,0.)
+                    return freq_dict[f]
         else:
             logger.warning(f"Attribute {attribute_name} not found!")
     
@@ -436,7 +436,7 @@ class Archiver():
             fail_dict = {a: r for a,r in zip(es.AttributeList,es.AttributeFailureFreqList)}
             for f in fail_dict:
                 if attribute_name.lower() in f:
-                    return fail_dict.get(f,0.)
+                    return fail_dict[f]
         else:
             logger.warning(f"Attribute {attribute_name} not found!")