diff --git a/terraform/eval_apply.go b/terraform/eval_apply.go
index e0723b335..b1b2b0eee 100644
--- a/terraform/eval_apply.go
+++ b/terraform/eval_apply.go
@@ -158,25 +158,27 @@ func (n *EvalApply) Eval(ctx EvalContext) (interface{}, error) {
 	// we still want to save that but it often causes some confusing behaviors
 	// where it seems like Terraform is failing to take any action at all,
 	// so we'll generate some errors to draw attention to it.
-	if change.Action == plans.Delete && !newVal.IsNull() {
-		diags = diags.Append(tfdiags.Sourceless(
-			tfdiags.Error,
-			"Provider returned invalid result object after apply",
-			fmt.Sprintf(
-				"After applying a %s plan, the provider returned a non-null object for %s. Destroying should always produce a null value, so this is always a bug in the provider and should be reported in the provider's own repository. Terraform will still save this errant object in the state for debugging and recovery.",
-				change.Action, n.Addr.Absolute(ctx.Path()),
-			),
-		))
-	}
-	if change.Action != plans.Delete && newVal.IsNull() {
-		diags = diags.Append(tfdiags.Sourceless(
-			tfdiags.Error,
-			"Provider returned invalid result object after apply",
-			fmt.Sprintf(
-				"After applying a %s plan, the provider returned a null object for %s. Only destroying should always produce a null value, so this is always a bug in the provider and should be reported in the provider's own repository.",
-				change.Action, n.Addr.Absolute(ctx.Path()),
-			),
-		))
+	if !applyDiags.HasErrors() {
+		if change.Action == plans.Delete && !newVal.IsNull() {
+			diags = diags.Append(tfdiags.Sourceless(
+				tfdiags.Error,
+				"Provider returned invalid result object after apply",
+				fmt.Sprintf(
+					"After applying a %s plan, the provider returned a non-null object for %s. Destroying should always produce a null value, so this is always a bug in the provider and should be reported in the provider's own repository. Terraform will still save this errant object in the state for debugging and recovery.",
+					change.Action, n.Addr.Absolute(ctx.Path()),
+				),
+			))
+		}
+		if change.Action != plans.Delete && newVal.IsNull() {
+			diags = diags.Append(tfdiags.Sourceless(
+				tfdiags.Error,
+				"Provider returned invalid result object after apply",
+				fmt.Sprintf(
+					"After applying a %s plan, the provider returned a null object for %s. Only destroying should always produce a null value, so this is always a bug in the provider and should be reported in the provider's own repository.",
+					change.Action, n.Addr.Absolute(ctx.Path()),
+				),
+			))
+		}
 	}
 
 	var newState *states.ResourceInstanceObject
@@ -239,10 +241,10 @@ func (n *EvalApplyPre) Eval(ctx EvalContext) (interface{}, error) {
 
 // EvalApplyPost is an EvalNode implementation that does the post-Apply work
 type EvalApplyPost struct {
-	Addr   addrs.ResourceInstance
-	Gen    states.Generation
-	State  **states.ResourceInstanceObject
-	Error  *error
+	Addr  addrs.ResourceInstance
+	Gen   states.Generation
+	State **states.ResourceInstanceObject
+	Error *error
 }
 
 // TODO: test