diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 5e4e56df..5212f17d 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -523,6 +523,7 @@ function install_irc_server {
     if [[ "$(cert_exists "${DEFAULT_DOMAIN_NAME}")" == "0" ]]; then
         "${PROJECT_NAME}-addcert" -h ngircd --dhkey "${DH_KEYLENGTH}"
         function_check check_certificates
+        CHECK_HOSTNAME=ngircd
         check_certificates ngircd
     fi
 
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index a1b6ff53..568988da 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -973,6 +973,7 @@ function install_xmpp {
     if [ ! -f "/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem" ]; then
         if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
             "${PROJECT_NAME}-addcert" -h xmpp --dhkey "${DH_KEYLENGTH}"
+            CHECK_HOSTNAME=xmpp
             check_certificates xmpp
             if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
                 echo $'Failed to create xmpp certificate'
diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 0c7e2e7d..b8959027 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1068,6 +1068,7 @@ function configure_imap {
 
     if [[ "$(cert_exists dovecot)" == "0" ]]; then
         "${PROJECT_NAME}-addcert" -h dovecot --dhkey "$DH_KEYLENGTH"
+        CHECK_HOSTNAME=dovecot
         check_certificates dovecot
     fi
 
diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web
index 290feca9..81bf3e1a 100755
--- a/src/freedombone-utils-web
+++ b/src/freedombone-utils-web
@@ -184,7 +184,8 @@ function test_domain_name {
 # Checks whether certificates were generated for the given hostname
 function check_certificates {
     if [ ! "$1" ]; then
-        return
+        echo $'No certificate name provided'
+        exit 3568736585683
     fi
     USE_LETSENCRYPT='no'
     if [ "$2" ]; then
@@ -259,6 +260,7 @@ function create_letsencrypt_cert {
             echo $"Lets Encrypt failed for ${SITE_DOMAIN_NAME}, so try making a self-signed cert"
             "${PROJECT_NAME}-addcert" -h "${SITE_DOMAIN_NAME}" --dhkey "${DH_KEYLENGTH}"
             function_check check_certificates
+            CHECK_HOSTNAME="${SITE_DOMAIN_NAME}"
             check_certificates "${SITE_DOMAIN_NAME}"
         else
             echo $"Lets Encrypt failed for $SITE_DOMAIN_NAME"
@@ -272,6 +274,7 @@ function create_letsencrypt_cert {
     fi
 
     function_check check_certificates
+    CHECK_HOSTNAME="${SITE_DOMAIN_NAME}"
     check_certificates "${SITE_DOMAIN_NAME}" 'yes'
 }
 
@@ -1013,6 +1016,7 @@ function email_install_tls {
     fi
     if [ ! -f /etc/ssl/certs/exim.dhparam ]; then
         "${PROJECT_NAME}-addcert" -h exim --dhkey "$DH_KEYLENGTH"
+        CHECK_HOSTNAME=exim
         check_certificates exim
         cp /etc/ssl/certs/exim.dhparam /etc/exim4
         chown root:Debian-exim /etc/exim4/exim.dhparam