diff --git a/internal/provider/namespace_resource.go b/internal/provider/namespace_resource.go
index ca711ba..e91a664 100644
--- a/internal/provider/namespace_resource.go
+++ b/internal/provider/namespace_resource.go
@@ -276,17 +276,21 @@ func (r *namespaceResource) Create(ctx context.Context, req resource.CreateReque
 	ctx, cancel := context.WithTimeout(ctx, createTimeout)
 	defer cancel()
 
-	regions := getRegionsFromModel(ctx, resp.Diagnostics, &plan)
+	regions, d := getRegionsFromModel(ctx, &plan)
+	resp.Diagnostics.Append(d...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	certFilters := getCertFiltersFromModel(ctx, resp.Diagnostics, &plan)
+	certFilters, d := getCertFiltersFromModel(ctx, &plan)
+	resp.Diagnostics.Append(d...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 	var codecServer *namespacev1.CodecServerSpec
 	if !plan.CodecServer.IsNull() {
-		codecServer = getCodecServerFromModel(ctx, resp.Diagnostics, &plan)
+		var d diag.Diagnostics
+		codecServer, d = getCodecServerFromModel(ctx, &plan)
+		resp.Diagnostics.Append(d...)
 		if resp.Diagnostics.HasError() {
 			return
 		}
@@ -348,7 +352,11 @@ func (r *namespaceResource) Create(ctx context.Context, req resource.CreateReque
 		return
 	}
 
-	updateModelFromSpec(ctx, resp.Diagnostics, &plan, ns.Namespace)
+	resp.Diagnostics.Append(updateModelFromSpec(ctx, &plan, ns.Namespace)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	resp.Diagnostics.Append(resp.State.Set(ctx, plan)...)
 }
 
@@ -368,7 +376,11 @@ func (r *namespaceResource) Read(ctx context.Context, req resource.ReadRequest,
 		return
 	}
 
-	updateModelFromSpec(ctx, resp.Diagnostics, &state, model.Namespace)
+	resp.Diagnostics.Append(updateModelFromSpec(ctx, &state, model.Namespace)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	resp.Diagnostics.Append(resp.State.Set(ctx, state)...)
 }
 
@@ -380,11 +392,13 @@ func (r *namespaceResource) Update(ctx context.Context, req resource.UpdateReque
 		return
 	}
 
-	regions := getRegionsFromModel(ctx, resp.Diagnostics, &plan)
+	regions, d := getRegionsFromModel(ctx, &plan)
+	resp.Diagnostics.Append(d...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
-	certFilters := getCertFiltersFromModel(ctx, resp.Diagnostics, &plan)
+	certFilters, d := getCertFiltersFromModel(ctx, &plan)
+	resp.Diagnostics.Append(d...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
@@ -396,7 +410,8 @@ func (r *namespaceResource) Update(ctx context.Context, req resource.UpdateReque
 		resp.Diagnostics.AddError("Failed to get current namespace status", err.Error())
 		return
 	}
-	codecServer := getCodecServerFromModel(ctx, resp.Diagnostics, &plan)
+	codecServer, d := getCodecServerFromModel(ctx, &plan)
+	resp.Diagnostics.Append(d...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
@@ -460,7 +475,11 @@ func (r *namespaceResource) Update(ctx context.Context, req resource.UpdateReque
 		return
 	}
 
-	updateModelFromSpec(ctx, resp.Diagnostics, &plan, ns.Namespace)
+	resp.Diagnostics.Append(updateModelFromSpec(ctx, &plan, ns.Namespace)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	resp.Diagnostics.Append(resp.State.Set(ctx, plan)...)
 }
 
@@ -505,11 +524,12 @@ func (r *namespaceResource) ImportState(ctx context.Context, req resource.Import
 	resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
 }
 
-func getRegionsFromModel(ctx context.Context, diags diag.Diagnostics, plan *namespaceResourceModel) []string {
+func getRegionsFromModel(ctx context.Context, plan *namespaceResourceModel) ([]string, diag.Diagnostics) {
+	var diags diag.Diagnostics
 	regions := make([]types.String, 0, len(plan.Regions.Elements()))
 	diags.Append(plan.Regions.ElementsAs(ctx, &regions, false)...)
 	if diags.HasError() {
-		return nil
+		return nil, diags
 	}
 
 	requestRegions := make([]string, len(regions))
@@ -517,16 +537,18 @@ func getRegionsFromModel(ctx context.Context, diags diag.Diagnostics, plan *name
 		requestRegions[i] = region.ValueString()
 	}
 
-	return requestRegions
+	return requestRegions, diags
 }
 
-func updateModelFromSpec(ctx context.Context, diags diag.Diagnostics, state *namespaceResourceModel, ns *namespacev1.Namespace) {
+func updateModelFromSpec(ctx context.Context, state *namespaceResourceModel, ns *namespacev1.Namespace) diag.Diagnostics {
+	var diags diag.Diagnostics
+
 	state.ID = types.StringValue(ns.GetNamespace())
 	state.Name = types.StringValue(ns.GetSpec().GetName())
 	planRegions, listDiags := types.ListValueFrom(ctx, types.StringType, ns.GetSpec().GetRegions())
 	diags.Append(listDiags...)
 	if diags.HasError() {
-		return
+		return diags
 	}
 
 	certificateFilter := types.ListNull(types.ObjectType{AttrTypes: namespaceCertificateFilterAttrs})
@@ -542,7 +564,7 @@ func updateModelFromSpec(ctx context.Context, diags diag.Diagnostics, state *nam
 			obj, diag := types.ObjectValueFrom(ctx, namespaceCertificateFilterAttrs, model)
 			diags.Append(diag...)
 			if diags.HasError() {
-				return
+				return diags
 			}
 			certificateFilterObjects[i] = obj
 		}
@@ -550,7 +572,7 @@ func updateModelFromSpec(ctx context.Context, diags diag.Diagnostics, state *nam
 		filters, diag := types.ListValueFrom(ctx, types.ObjectType{AttrTypes: namespaceCertificateFilterAttrs}, certificateFilterObjects)
 		diags.Append(diag...)
 		if diags.HasError() {
-			return
+			return diags
 		}
 
 		certificateFilter = filters
@@ -593,24 +615,28 @@ func updateModelFromSpec(ctx context.Context, diags diag.Diagnostics, state *nam
 	endpointsState, objectDiags := types.ObjectValueFrom(ctx, endpointsAttrs, endpoints)
 	diags.Append(objectDiags...)
 	if diags.HasError() {
-		return
+		return diags
 	}
 
 	state.Endpoints = endpointsState
 	state.Regions = planRegions
 	state.CertificateFilters = certificateFilter
 	state.RetentionDays = types.Int64Value(int64(ns.GetSpec().GetRetentionDays()))
+
+	return diags
 }
 
-func getCertFiltersFromModel(ctx context.Context, diags diag.Diagnostics, model *namespaceResourceModel) []*namespacev1.CertificateFilterSpec {
+func getCertFiltersFromModel(ctx context.Context, model *namespaceResourceModel) ([]*namespacev1.CertificateFilterSpec, diag.Diagnostics) {
+	var diags diag.Diagnostics
+
 	elements := make([]types.Object, 0, len(model.CertificateFilters.Elements()))
 	diags.Append(model.CertificateFilters.ElementsAs(ctx, &elements, false)...)
 	if diags.HasError() {
-		return nil
+		return nil, diags
 	}
 
 	if len(elements) == 0 {
-		return nil
+		return nil, diags
 	}
 
 	certificateFilters := make([]*namespacev1.CertificateFilterSpec, len(elements))
@@ -618,7 +644,7 @@ func getCertFiltersFromModel(ctx context.Context, diags diag.Diagnostics, model
 		var model namespaceCertificateFilterModel
 		diags.Append(filter.As(ctx, &model, basetypes.ObjectAsOptions{})...)
 		if diags.HasError() {
-			return nil
+			return nil, diags
 		}
 
 		certificateFilters[i] = &namespacev1.CertificateFilterSpec{
@@ -629,20 +655,21 @@ func getCertFiltersFromModel(ctx context.Context, diags diag.Diagnostics, model
 		}
 	}
 
-	return certificateFilters
+	return certificateFilters, diags
 }
 
-func getCodecServerFromModel(ctx context.Context, diags diag.Diagnostics, model *namespaceResourceModel) *namespacev1.CodecServerSpec {
+func getCodecServerFromModel(ctx context.Context, model *namespaceResourceModel) (*namespacev1.CodecServerSpec, diag.Diagnostics) {
+	var diags diag.Diagnostics
 	var codecServer codecServerModel
 	diags.Append(model.CodecServer.As(ctx, &codecServer, basetypes.ObjectAsOptions{})...)
 	if diags.HasError() {
-		return nil
+		return nil, diags
 	}
 	return &namespacev1.CodecServerSpec{
 		Endpoint:                      codecServer.Endpoint.ValueString(),
 		PassAccessToken:               codecServer.PassAccessToken.ValueBool(),
 		IncludeCrossOriginCredentials: codecServer.IncludeCrossOriginCredentials.ValueBool(),
-	}
+	}, diags
 }
 
 func stringOrNull(s string) types.String {