diff --git a/internal/clients/api_client.go b/internal/clients/api_client.go
index 83d6cf766..ba0b4dcf3 100644
--- a/internal/clients/api_client.go
+++ b/internal/clients/api_client.go
@@ -363,12 +363,14 @@ func (a *ApiClient) ServerVersion(ctx context.Context) (*version.Version, diag.D
 func (a *ApiClient) versionFromKibana() (*version.Version, diag.Diagnostics) {
 	kibClient, err := a.GetKibanaClient()
 	if err != nil {
-		return nil, diag.FromErr(err)
+		return nil, diag.Errorf("failed to get version from Kibana API: %s, "+
+			"please ensure a working 'kibana' endpoint is configured", err.Error())
 	}
 
 	status, err := kibClient.KibanaStatus.Get()
 	if err != nil {
-		return nil, diag.FromErr(err)
+		return nil, diag.Errorf("failed to get version from Kibana API: %s, "+
+			"Please ensure a working 'kibana' endpoint is configured", err.Error())
 	}
 
 	vMap, ok := status["version"].(map[string]interface{})
diff --git a/internal/fleet/agent_policy/update.go b/internal/fleet/agent_policy/update.go
index 2bdac21e8..9f26c58ad 100644
--- a/internal/fleet/agent_policy/update.go
+++ b/internal/fleet/agent_policy/update.go
@@ -24,6 +24,9 @@ func (r *agentPolicyResource) Update(ctx context.Context, req resource.UpdateReq
 
 	sVersion, e := r.client.ServerVersion(ctx)
 	if e != nil {
+		for _, a := range e {
+			resp.Diagnostics.AddError(a.Summary, a.Detail)
+		}
 		return
 	}