diff --git a/tasks/main.yml b/tasks/main.yml
index df08ba2..8b7f398 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,6 +25,11 @@
     uuid: '{{ edge_ps_self.uUID }}'
   when: edge_ps_self is defined and 'ps' in server_types
 
+- name: Fail if uuid is not set
+  fail:
+    msg: "No uUID available, please make sure that server is running"
+  when: uuid: is not defined
+
 - name: Use local {{ local_mgmt_ip }} to set reachability to {{ reachability }} if set
   uri:
     user: '{{ opdk_user_email }}'
@@ -33,7 +38,6 @@
     body_format: raw
     url: "http://{{ local_mgmt_ip }}:{{ ms_ext_mgmt_port }}/v1/servers/{{ uuid }}"
     body: reachable={{ reachability }}
-  when: uuid is defined
 
 - name: Allow calls in flight to complete
   become: no