diff --git a/ansible/roles/ansible-role-lr62-workflows/tasks/main.yaml b/ansible/roles/ansible-role-lr62-workflows/tasks/main.yaml
index ea62373..d2920e5 100644
--- a/ansible/roles/ansible-role-lr62-workflows/tasks/main.yaml
+++ b/ansible/roles/ansible-role-lr62-workflows/tasks/main.yaml
@@ -26,6 +26,6 @@
     src: "{{ target_path }}/{{ item }}.json"
     body_format: json
     follow_redirects: yes
-    status_code: [200, 204, 409, 500]
+    status_code: [200, 204, 409]
   loop:
     "{{ workflows }}"
diff --git a/ansible/roles/ansible-role-lr62-workflows/templates/user-group-role_created.json.j2 b/ansible/roles/ansible-role-lr62-workflows/templates/user-group-role_created.json.j2
index b7c6d7a..85c7e1b 100644
--- a/ansible/roles/ansible-role-lr62-workflows/templates/user-group-role_created.json.j2
+++ b/ansible/roles/ansible-role-lr62-workflows/templates/user-group-role_created.json.j2
@@ -47,6 +47,27 @@
 				}
 			}
 		},
+		{
+                        "name": "check_user_existance",
+                        "taskReferenceName": "check_user_existance",
+                        "inputParameters": {
+                                "user": "${lookup_user.output.body[0]}"
+                        },
+                        "type": "DECISION",
+                        "caseExpression": "($.user == null ? 'true' : 'false')",
+                        "decisionCases": {
+                                "true": [
+                                        {
+                                                "name" : "terminate",
+                                                "taskReferenceName" : "terminate_when_no_user",
+                                                "type" : "TERMINATE",
+                                                "inputParameters" : {
+                                                        "terminationStatus" : "COMPLETED"
+                                                }
+                                        }
+                                ]
+                        }
+                },
 		{
 			"name" : "pyrest",
 			"taskReferenceName" : "lookup_client",
diff --git a/ansible/roles/ansible-role-lr62-workflows/templates/user-group-role_deleted.json.j2 b/ansible/roles/ansible-role-lr62-workflows/templates/user-group-role_deleted.json.j2
index 6d74330..08ad250 100644
--- a/ansible/roles/ansible-role-lr62-workflows/templates/user-group-role_deleted.json.j2
+++ b/ansible/roles/ansible-role-lr62-workflows/templates/user-group-role_deleted.json.j2
@@ -47,6 +47,27 @@
 				}
 			}
 		},
+		{
+                        "name": "check_user_existance",
+                        "taskReferenceName": "check_user_existance",
+                        "inputParameters": {
+                                "user": "${lookup_user.output.body[0]}"
+                        },
+                        "type": "DECISION",
+                        "caseExpression": "($.user == null ? 'true' : 'false')",
+                        "decisionCases": {
+                                "true": [
+                                        {
+                                                "name" : "terminate",
+                                                "taskReferenceName" : "terminate_when_no_user",
+                                                "type" : "TERMINATE",
+                                                "inputParameters" : {
+                                                        "terminationStatus" : "COMPLETED"
+                                                }
+                                        }
+                                ]
+                        }
+                },
 		{
 			"name" : "pyrest",
 			"taskReferenceName" : "lookup_client",
diff --git a/ansible/roles/ansible-role-lr62-workflows/templates/user-group_deleted.json.j2 b/ansible/roles/ansible-role-lr62-workflows/templates/user-group_deleted.json.j2
index 6b1c2ac..966eadf 100644
--- a/ansible/roles/ansible-role-lr62-workflows/templates/user-group_deleted.json.j2
+++ b/ansible/roles/ansible-role-lr62-workflows/templates/user-group_deleted.json.j2
@@ -48,6 +48,27 @@
 				}
 			}
 		},
+                {
+			"name": "check_user_existance",
+			"taskReferenceName": "check_user_existance",
+			"inputParameters": {
+				"user": "${lookup_user.output.body[0]}"
+			},
+			"type": "DECISION",
+			"caseExpression": "($.user == null ? 'true' : 'false')",
+			"decisionCases": {
+				"true": [
+					{
+						"name" : "terminate",
+						"taskReferenceName" : "terminate_when_no_user",
+						"type" : "TERMINATE",
+						"inputParameters" : {
+							"terminationStatus" : "COMPLETED"
+						}
+					}
+				]
+			}
+		},
 		{
 			"name" : "pyrest",
 			"taskReferenceName" : "lookup_client",