diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index e9dee99..68b2fb8 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -17,19 +17,28 @@
 
   rescue:
 
-    - name: expose baseurl in epel.repo definition
-      replace:
-         backup: yes
-         regexp: '^(#baseurl=)(.*)'
-         replace: 'baseurl=\2'
-         dest: '/etc/yum.repos.d/epel.repo'
+    - name: Check for existence of epel.repo
+      stat:
+        path: /etc/yum.repos.d/epel.repo
+      register: epel
 
-    - name: remove mirrorlist in epel.repo definition
-      replace:
-         backup: yes
-         regexp: '^(mirrorlist=)(.*)'
-         replace: '#mirrorlist=\2'
-         dest: /etc/yum.repos.d/epel.repo"
+    - block:
+
+      - name: expose baseurl in epel.repo definition
+        replace:
+           backup: yes
+           regexp: '^(#baseurl=)(.*)'
+           replace: 'baseurl=\2'
+           dest: '/etc/yum.repos.d/epel.repo'
+
+      - name: remove mirrorlist in epel.repo definition
+        replace:
+           backup: yes
+           regexp: '^(mirrorlist=)(.*)'
+           replace: '#mirrorlist=\2'
+           dest: /etc/yum.repos.d/epel.repo"
+
+      when: epel.stat.exists
 
     - name: Update toubleshooting OS packages
       become: yes
diff --git a/tasks/with_proxy.yml b/tasks/with_proxy.yml
index ee581be..e19645d 100644
--- a/tasks/with_proxy.yml
+++ b/tasks/with_proxy.yml
@@ -20,19 +20,28 @@
 
   rescue:
 
-    - name: expose baseurl in epel.repo definition
-      replace:
-         backup: yes
-         regexp: '^(#baseurl=)(.*)'
-         replace: 'baseurl=\2'
-         dest: '/etc/yum.repos.d/epel.repo'
+    - name: Check for existence of epel.repo
+      stat:
+        path: /etc/yum.repos.d/epel.repo
+      register: epel
 
-    - name: remove mirrorlist in epel.repo definition
-      replace:
-         backup: yes
-         regexp: '^(mirrorlist=)(.*)'
-         replace: '#mirrorlist=\2'
-         dest: /etc/yum.repos.d/epel.repo"
+    - block:
+
+      - name: expose baseurl in epel.repo definition
+        replace:
+           backup: yes
+           regexp: '^(#baseurl=)(.*)'
+           replace: 'baseurl=\2'
+           dest: '/etc/yum.repos.d/epel.repo'
+
+      - name: remove mirrorlist in epel.repo definition
+        replace:
+           backup: yes
+           regexp: '^(mirrorlist=)(.*)'
+           replace: '#mirrorlist=\2'
+           dest: /etc/yum.repos.d/epel.repo"
+
+      when: epel.stat.exists
 
     - name: Update troubleshooting OS packages
       become: yes