diff --git a/ccloud/resource_api_key.go b/ccloud/resource_api_key.go
index c31f8a3..00f2ccb 100644
--- a/ccloud/resource_api_key.go
+++ b/ccloud/resource_api_key.go
@@ -60,8 +60,16 @@ func apiKeyCreate(d *schema.ResourceData, meta interface{}) error {
 	key, err := c.CreateAPIKey(&req)
 	if err == nil {
 		d.SetId(fmt.Sprintf("%d", key.ID))
-		d.Set("key", key.Key)
-		d.Set("secret", key.Secret)
+
+		err = d.Set("key", key.Key)
+		if err != nil {
+			return err
+		}
+
+		err = d.Set("secret", key.Secret)
+		if err != nil {
+			return err
+		}
 	} else {
 		log.Printf("[WARN] err creating: %s", err)
 	}
diff --git a/ccloud/resource_environment.go b/ccloud/resource_environment.go
index baab4c3..bd6722f 100644
--- a/ccloud/resource_environment.go
+++ b/ccloud/resource_environment.go
@@ -71,7 +71,10 @@ func environmentRead(d *schema.ResourceData, meta interface{}) error {
 		return err
 	}
 
-	d.Set("name", env.Name)
+	err = d.Set("name", env.Name)
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
diff --git a/ccloud/resource_kafka_cluster.go b/ccloud/resource_kafka_cluster.go
index e3fc61c..a840e9f 100644
--- a/ccloud/resource_kafka_cluster.go
+++ b/ccloud/resource_kafka_cluster.go
@@ -87,7 +87,10 @@ func clusterCreate(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	d.SetId(cluster.ID)
-	d.Set("bootstrap_servers", cluster.Endpoint)
+	err = d.Set("bootstrap_servers", cluster.Endpoint)
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -106,25 +109,10 @@ func clusterRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	log.Printf("[WARN] hello %s", cluster.APIEndpoint)
-	d.Set("bootstrap_servers", cluster.Endpoint)
+	err = d.Set("bootstrap_servers", cluster.Endpoint)
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
-
-func nameFromRD(d *schema.ResourceData) string {
-	return d.Get("name").(string)
-}
-
-func configFromRD(d *schema.ResourceData) map[string]string {
-	cfg := d.Get("config").(map[string]interface{})
-	scfg := d.Get("config_sensitive").(map[string]interface{})
-	config := make(map[string]string)
-	for k, v := range cfg {
-		config[k] = v.(string)
-	}
-	for k, v := range scfg {
-		config[k] = v.(string)
-	}
-
-	return config
-}