diff --git a/addons/snailmail/static/src/js/snailmail_external_layout.js b/addons/snailmail/static/src/js/snailmail_external_layout.js
index be691d26ba0421e1d408b31fa73df8b6826ac090..055c7e292e3dfbfd61a7298d89a0b2e579d273f5 100644
--- a/addons/snailmail/static/src/js/snailmail_external_layout.js
+++ b/addons/snailmail/static/src/js/snailmail_external_layout.js
@@ -1,6 +1,6 @@
 // Change address font-size if needed
 document.addEventListener('DOMContentLoaded', function (evt) {
-    var recipientAddress = document.getElementsByClassName('address row')[0].getElementsByTagName('address')[0];
+    var recipientAddress = document.querySelector('.address.row div[name="address"]').getElementsByTagName('address')[0];
     var height = parseFloat(window.getComputedStyle(recipientAddress, null).getPropertyValue('height'));
     var fontSize = parseFloat(window.getComputedStyle(recipientAddress, null).getPropertyValue('font-size'));
     recipientAddress.style.fontSize = (85/height) * fontSize + 'px';
diff --git a/addons/snailmail_account/tests/test_pingen_send.py b/addons/snailmail_account/tests/test_pingen_send.py
index ea4cd973487b6388679ac709da82231eca185bb1..adc23e157a1d8edb10ca63e72da3b8c4dda45bdb 100644
--- a/addons/snailmail_account/tests/test_pingen_send.py
+++ b/addons/snailmail_account/tests/test_pingen_send.py
@@ -62,14 +62,14 @@ class TestPingenSend(AccountingTestCase):
         }
 
         response = requests.post(self.pingen_url, data=self.data, files=files)
-        if 400 <= response.status_code <= 599:
+        if 400 <= response.status_code <= 599 or response.json()['error']:
             msg = "%(code)s %(side)s Error: %(reason)s for url: %(url)s\n%(body)s" % {
                 'code': response.status_code,
                 'side': r"%s",
                 'reason': response.reason,
                 'url': self.pingen_url,
                 'body': response.text}
-            if response.status_code <= 499:
+            if response.status_code <= 499 or response.json()['error']:
                 raise requests.HTTPError(msg % "Client")
             else:
                 _logger.warning(msg % "Server")