diff --git a/src/stacosys/run.py b/src/stacosys/run.py
index 42d903c..d311049 100644
--- a/src/stacosys/run.py
+++ b/src/stacosys/run.py
@@ -46,9 +46,13 @@ def configure_and_validate_mailer(config, logger):
         config.get(ConfigParameter.SMTP_LOGIN),
         config.get(ConfigParameter.SMTP_PASSWORD),
     )
-    mailer.configure_destination(config.get(ConfigParameter.SITE_ADMIN_EMAIL))
-    if not mailer.check():
-        logger.error("Email configuration not working")
+    mailer.configure_destination(config.get(ConfigParameter.SITE_ADMIN_EMAIL))    
+    try:
+        if not mailer.check():
+            logger.error("Email configuration not working")
+            sys.exit(1)
+    except Exception as e:
+        logging.error("Failed to check email: %s", e)
         sys.exit(1)
     return mailer