diff --git a/agent/connect/ca/provider_aws.go b/agent/connect/ca/provider_aws.go
index 73edc95f8..e03f35984 100644
--- a/agent/connect/ca/provider_aws.go
+++ b/agent/connect/ca/provider_aws.go
@@ -12,9 +12,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/acmpca"
-	"github.com/mitchellh/mapstructure"
-
 	"github.com/hashicorp/go-hclog"
+	"github.com/mitchellh/mapstructure"
 
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/structs"
diff --git a/agent/consul/leader_connect_ca.go b/agent/consul/leader_connect_ca.go
index cb646dfe1..9a6f73631 100644
--- a/agent/consul/leader_connect_ca.go
+++ b/agent/consul/leader_connect_ca.go
@@ -105,6 +105,9 @@ func (c *caDelegateWithState) ApplyCALeafRequest() (uint64, error) {
 		Datacenter: c.Server.config.Datacenter,
 	}
 	resp, err := c.Server.raftApplyMsgpack(structs.ConnectCALeafRequestType|structs.IgnoreUnknownTypeFlag, &req)
+	if err != nil {
+		return 0, err
+	}
 
 	modIdx, ok := resp.(uint64)
 	if !ok {