diff --git a/tasks/main.yml b/tasks/main.yml
index e046a2e..32ab6cd 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -20,6 +20,11 @@
       '(?i) y/n: ': 'y'
   when: opdk_version | version_compare('4.16.05', '>')
 
+- name: Confirm existence of edge-message-processor
+  state:
+    path: "{{ apigee_home }}/edge-message-processor"
+  register: mp_exists
+
 - name: Restart Edge Message Processor
   shell: '/opt/apigee/apigee-service/bin/apigee-service edge-message-processor restart'
-  removes: "{{ apigee_home }}/edge-message-processor"
\ No newline at end of file
+  when: mp_exists.stat.exists