diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml
index 0b265238e..cbc1d5d58 100644
--- a/roles/openvpn/tasks/main.yml
+++ b/roles/openvpn/tasks/main.yml
@@ -24,7 +24,7 @@
     group: root
     mode: 0755
 
-- name: Create a folder for iiab executable not on path
+- name: Create folder /usr/lib/iiab (not on path) for iiab executables start & up_wan
   file:
     path: /usr/lib/iiab
     state: directory
@@ -60,6 +60,7 @@
     group: root
     mode: 0644
     backup: yes
+  when: openvpn_handle is defined
 
 - name: Put up_wan in place (debuntu)
   template:
@@ -159,8 +160,9 @@
     value: "OpenVPN is a means of connecting to other machines anywhere on the internet, via a middleman server, using Virtual Private Network techniques to create secure connections."
   - option: enabled
     value: "{{ openvpn_enabled }}"
-  - option: handle
-    value: "{{ openvpn_handle }}"
+# Uncomment *if* openvpn_handle variable later becomes mandatory
+# - option: handle
+#   value: "{{ openvpn_handle }}"
   - option: cron_enabled
     value: "{{ openvpn_cron_enabled }}"
   - option: server