diff --git a/tasks/main.yml b/tasks/main.yml
index ef8b7db..49b0e13 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -128,11 +128,17 @@
     line: 'export CONTINUE_ON_WARNING={{ apigee_continue_on_warning }}'
     backup: yes
 
+- name: Create pip config folder
+  file:
+    path: "{{ pip_conf_dir }}"
+    state: directory
+  when: pip_conf_dir is defined
+
 - name: Configure pip
   template:
     src: pip.conf.j2
     dest: "{{ pip_conf_dir }}/pip.conf"
-  when: pip_index_url is defined
+  when: pip_conf_dir is defined and pip_index_url is defined
 
 - name: Download pip package manager
   become: yes