diff --git a/src/freedombone-app-bludit b/src/freedombone-app-bludit
index 871655e0..6c5e4210 100755
--- a/src/freedombone-app-bludit
+++ b/src/freedombone-app-bludit
@@ -217,6 +217,11 @@ function install_bludit {
     apt-get -yq install php-gettext php-curl php-gd php-mysql git curl
     apt-get -yq install memcached php-memcached php-intl exiftool libfcgi0ldbl
 
+    if [ ! "$BLUDIT_DOMAIN_NAME" ]; then
+        echo $'No domain name was given'
+        exit 3568356
+    fi
+
     if [ -d "/var/www/$BLUDIT_DOMAIN_NAME/htdocs" ]; then
         rm -rf "/var/www/$BLUDIT_DOMAIN_NAME/htdocs"
     fi
diff --git a/src/freedombone-template b/src/freedombone-template
index f367a83c..3ac62fc5 100755
--- a/src/freedombone-template
+++ b/src/freedombone-template
@@ -594,6 +594,11 @@ if [[ "$app_php" == 'yes' ]]; then
     echo ''
 fi
 
+echo "    if [ ! \"\$${app_name_upper}_DOMAIN_NAME\" ]; then"
+echo "        echo \$'No domain name was given'"
+echo '        exit 3568356'
+echo '    fi'
+echo ''
 echo "    if [ -d \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\" ]; then"
 echo "        rm -rf \"/var/www/\$${app_name_upper}_DOMAIN_NAME/htdocs\""
 echo '    fi'