diff --git a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseMailServer.xml b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseMailServer.xml
index 8a128b927b1170bdb24081e17dc785894f40c73d..5ae2969e00c47fc4588cac70f1dfdb27335c7358 100644
--- a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseMailServer.xml
+++ b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseMailServer.xml
@@ -54,7 +54,6 @@
 \n
 portal = context.getPortalObject()\n
 mailhost = portal.MailHost\n
-promise_url = portal.getPromiseParameter(\'external_service\', \'smtp_url\').rstrip(\'/\')\n
 if getattr(mailhost, \'getMessageList\', None) is not None:\n
   context.newActiveProcess().postResult(ActiveResult(\n
     severity=1,\n
@@ -63,10 +62,12 @@ if getattr(mailhost, \'getMessageList\', None) is not None:\n
   ))\n
   return\n
 \n
+promise_url = portal.getPromiseParameter(\'external_service\', \'smtp_url\')\n
 \n
 if promise_url is None:\n
   return\n
 \n
+promise_url = promise_url.rstrip(\'/\')\n
 if mailhost.force_tls:\n
   protocol = \'smtps\'\n
 else:\n
diff --git a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installMailServer.xml b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installMailServer.xml
index 625f2162109bb4a7210772ef270951e6d7ad9eef..fafeda95fdf67734fb197c431b443611f90e7f01 100644
--- a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installMailServer.xml
+++ b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installMailServer.xml
@@ -57,6 +57,9 @@ if getattr(mailhost, \'getMessageList\', None) is not None:\n
   return\n
 promise_url = portal.getPromiseParameter(\'external_service\', \'smtp_url\')\n
 \n
+if promise_url is None:\n
+  return\n
+\n
 protocol, promise_url = promise_url.split(\'://\', 1)\n
 \n
 if protocol == \'smtps\':\n
diff --git a/bt5/erp5_promise/bt/revision b/bt5/erp5_promise/bt/revision
index 410b14d2ce6f958c13adcb30807e8673074c49d9..978b4e8e518d1242cbf102a1bebdb52e41705102 100644
--- a/bt5/erp5_promise/bt/revision
+++ b/bt5/erp5_promise/bt/revision
@@ -1 +1 @@
-25
\ No newline at end of file
+26
\ No newline at end of file