diff --git a/tasks/nginx-config.yml b/tasks/nginx-config.yml
index 10b3924..adfcefc 100644
--- a/tasks/nginx-config.yml
+++ b/tasks/nginx-config.yml
@@ -48,7 +48,7 @@
       loop: '{{ nginx_conf_remote_global_conf }}'
       delegate_to: 'localhost'
 
-    - name: Install any remote snippet configuration file
+    - name: Install any remote global configuration file
       template:
         src: '/var/tmp/{{ item.name }}'
         dest: '/etc/nginx/conf.d/{{ item.name }}.conf'
diff --git a/templates/nginx-virthost.j2 b/templates/nginx-virthost.j2
index be2de17..f608876 100644
--- a/templates/nginx-virthost.j2
+++ b/templates/nginx-virthost.j2
@@ -5,12 +5,16 @@ include /etc/nginx/snippets/nginx-websockets.conf;
 include /etc/nginx/snippets/nginx-websockets.conf;
 {% endif %}
 {% endif %}
+{% if item.global_additional_options is defined %}
 {% for add_opt in item.global_additional_options %}
 {{ add_opt }};
 {% endfor %}
+{% endif %}
+{% if item.proxy_global_additional_options is defined %}
 {% for popt in item.proxy_global_additional_options %}
 {{ popt }};
 {% endfor %}
+{% endif %}
 
 {% if item.upstream_backends is defined %}
 {% for u_bk in item.upstream_backends %}