diff --git a/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py b/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py
index 19ecc9f43be9a3cf4ce278433f27fc7da635b570..6fb010563a696fd2eb5d14b3df619a4e8d083511 100644
--- a/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py
+++ b/CEP/Pipeline/framework/lofarpipe/support/loggingdecorators.py
@@ -189,7 +189,7 @@ def mail_log_on_exception(target):
             try:
                 pconfig = PipelineEmailConfig()
             except Exception as e:
-                raise Exception("loggingdecorators.py: Could not find the pipeline default configuration file: %s" % (e) )
+                raise Exception("loggingdecorators.py: Could not find the pipeline email configuration file: %s" % (e) )
             
             for entry in mail_list:
                 _mail_msg_to(pconfig['error-sender'], entry,
diff --git a/LCS/PyCommon/defaultmailaddresses.py b/LCS/PyCommon/defaultmailaddresses.py
index e16653e5fb6c1d09e4e073b8a56bc6342867b008..d67442d11e07356ef0bacea1b616d37f9418572a 100644
--- a/LCS/PyCommon/defaultmailaddresses.py
+++ b/LCS/PyCommon/defaultmailaddresses.py
@@ -1,6 +1,6 @@
-# util.py: utils for lofar software
+# defaultmailaddresses.py: default mail addresses for the LOFAR software
 #
-# Copyright (C) 2015
+# Copyright (C) 2017
 # ASTRON (Netherlands Institute for Radio Astronomy)
 # P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
 #
@@ -59,7 +59,7 @@ class PipelineEmailConfig():
             filepatterns = ["{LOFARROOT}/etc/email/*.ini",
                     "{HOME}/.lofar/email/*.ini"]# TODO correct the pattern here
         self.configfiles = sum([findfiles(p) for p in filepatterns],[])
-        if len(self.configfiles) == 0:
+        if not self.configfiles:
             raise Exception("no config file found")
         self.config = None
 
@@ -74,7 +74,6 @@ class PipelineEmailConfig():
 
     def __getitem__(self, what):
         return self.get(what)
-#pipelines = {"error-sender":"softwaresupport@lofar.eu"}
 
 
 
diff --git a/LCS/PyCommon/test/t_defaultmailaddresses.py b/LCS/PyCommon/test/t_defaultmailaddresses.py
index fde9ee36adab5ca7d503f53111ff668a2f4ef564..9fc2dd1c957437c12b34841db54c0b54a2d77f5f 100644
--- a/LCS/PyCommon/test/t_defaultmailaddresses.py
+++ b/LCS/PyCommon/test/t_defaultmailaddresses.py
@@ -43,10 +43,10 @@ error-sender = softwaresupport@astron.nl
 
         
 
-def main(argv):
+def main():
   unittest.main()
 
 if __name__ == "__main__":
   # run all tests
   import sys
-  main(sys.argv[1:])
+  main()