diff --git a/releasenotes/notes/handle-no-deployment-status-a70a4b950171afbe.yaml b/releasenotes/notes/handle-no-deployment-status-a70a4b950171afbe.yaml
new file mode 100644
index 000000000..44b3b71eb
--- /dev/null
+++ b/releasenotes/notes/handle-no-deployment-status-a70a4b950171afbe.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - The tripleo.deployment.v1.get_deployment_status workflow will no longer
+    error when requesting the deployment status for a non-existant plan. A
+    message is sent in the output instead of failing the workflow.
diff --git a/workbooks/deployment.yaml b/workbooks/deployment.yaml
index 28375cd9c..a2ca2b76c 100644
--- a/workbooks/deployment.yaml
+++ b/workbooks/deployment.yaml
@@ -697,8 +697,8 @@ workflows:
           deployment_status: <% yaml_parse(task().result.last()) %>
         on-complete: send_message
         publish-on-error:
-          status: FAILED
-          message: <% task().result %>
+          message: No deployment status found for plan <% $.plan %>
+          deployment_status: ""
 
       send_message:
         workflow: tripleo.messaging.v1.send