diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot
index c2a20dcd..b96403b2 100755
--- a/src/freedombone-app-scuttlebot
+++ b/src/freedombone-app-scuttlebot
@@ -44,6 +44,8 @@ GIT_SSB_PORT=7718
 NGINX_GIT_SSB_PORT=7719
 
 scuttlebot_variables=(MY_USERNAME
+                      SCUTTLEBOT_DOMAIN_NAME
+                      SCUTTLEBOT_CODE
                       DEFAULT_DOMAIN_NAME
                       SYSTEM_TYPE)
 
@@ -225,6 +227,9 @@ function scuttlebot_git_setup {
         echo '  add_header X-Content-Type-Options nosniff;' >> $git_ssb_nginx_site
         echo '  add_header X-Frame-Options SAMEORIGIN;' >> $git_ssb_nginx_site
     else
+        if [ ! $SCUTTLEBOT_DOMAIN_NAME ]; then
+            exit 7357225
+        fi
         git_ssb_nginx_site=/etc/nginx/sites-available/${SCUTTLEBOT_DOMAIN_NAME}
         function_check nginx_http_redirect
         nginx_http_redirect $SCUTTLEBOT_DOMAIN_NAME "index index.html"