diff --git a/app/email_utils.py b/app/email_utils.py
index 595c4d07..3583bfc8 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -1202,7 +1202,7 @@ def sl_sendmail(
 
 def get_queue_id(msg: Message) -> Optional[str]:
     """Get the Postfix queue-id from a message"""
-    received_header = msg["Received"]
+    received_header = str(msg["Received"])
     if not received_header:
         return
 
diff --git a/cron.py b/cron.py
index aeaf5700..3b93a639 100644
--- a/cron.py
+++ b/cron.py
@@ -801,6 +801,9 @@ async def _hibp_check(api_key, queue):
         elif r.status_code == 404:
             # No breaches found
             alias.hibp_breaches = []
+        elif r.status_code > 500:
+            LOG.w("HIBP server 5** error %s", r.status_code)
+            return
         else:
             LOG.error(
                 "An error occured while checking alias %s: %s - %s",
diff --git a/tests/api/test_alias_options.py b/tests/api/test_alias_options.py
index 95fca1c2..75703f9a 100644
--- a/tests/api/test_alias_options.py
+++ b/tests/api/test_alias_options.py
@@ -29,7 +29,7 @@ def test_different_scenarios_v4(flask_client):
 
     # <<< with hostname >>>
     r = flask_client.get(
-        url_for("api.options_v3", hostname="www.test.com"),
+        url_for("api.options_v4", hostname="www.test.com"),
         headers={"Authentication": api_key.code},
     )
 
@@ -44,14 +44,14 @@ def test_different_scenarios_v4(flask_client):
     db.session.commit()
 
     r = flask_client.get(
-        url_for("api.options_v3", hostname="www.test.com"),
+        url_for("api.options_v4", hostname="www.test.com"),
         headers={"Authentication": api_key.code},
     )
     assert r.json["recommendation"]["alias"] == alias.email
     assert r.json["recommendation"]["hostname"] == "www.test.com"
 
 
-def test_different_scenarios_v4(flask_client):
+def test_different_scenarios_v4_2(flask_client):
     user = User.create(
         email="a@b.c", password="password", name="Test User", activated=True
     )