diff --git a/coreos-config/roles/compose_project/tasks/remove.yml b/coreos-config/roles/compose_project/tasks/remove.yml
index 1b0c815..2e9e61d 100644
--- a/coreos-config/roles/compose_project/tasks/remove.yml
+++ b/coreos-config/roles/compose_project/tasks/remove.yml
@@ -1,11 +1,18 @@
 ---
+- name: Check if service is present
+  stat:
+    path: "{{ service_dir | mandatory }}"
+  register: dir
+
 - name: Stop Service
   community.docker.docker_compose:
     project_src: "{{ service_dir | mandatory }}"
     state: absent
     remove_orphans: true
+  when: dir.stat.exists == True
 
 - name: Remove Service
   file:
     state: absent
     path: "{{ service_dir | mandatory }}"
+  when: dir.stat.exists == True