diff --git a/command/deployment_status.go b/command/deployment_status.go
index 739c7e46cb72..2cf045547eb1 100644
--- a/command/deployment_status.go
+++ b/command/deployment_status.go
@@ -169,6 +169,9 @@ func getDeployment(client *api.Deployments, dID string) (match *api.Deployment,
 }
 
 func formatDeployment(d *api.Deployment, uuidLength int) string {
+	if d == nil {
+		return "No deployment found"
+	}
 	// Format the high-level elements
 	high := []string{
 		fmt.Sprintf("ID|%s", limit(d.ID, uuidLength)),