diff --git a/pkg/resources/grant_helpers.go b/pkg/resources/grant_helpers.go
index 7e777707c9..c48add964a 100644
--- a/pkg/resources/grant_helpers.go
+++ b/pkg/resources/grant_helpers.go
@@ -268,7 +268,7 @@ func readGenericGrant(
 	}
 
 	var existingRoles *schema.Set
-	if v, ok := d.GetOk("roles"); ok {
+	if v, ok := d.GetOk("roles"); ok && v != nil {
 		existingRoles = v.(*schema.Set)
 	}
 	multipleGrantFeatureFlag := d.Get("enable_multiple_grants").(bool)
@@ -287,7 +287,7 @@ func readGenericGrant(
 	}
 
 	var existingShares *schema.Set
-	if v, ok := d.GetOk("shares"); ok {
+	if v, ok := d.GetOk("shares"); ok && v != nil {
 		existingShares = v.(*schema.Set)
 	}
 	// Now see which shares have our privilege.
diff --git a/pkg/resources/role_grants.go b/pkg/resources/role_grants.go
index 90de5ccb1a..3a23e8c7bb 100644
--- a/pkg/resources/role_grants.go
+++ b/pkg/resources/role_grants.go
@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/jmoiron/sqlx"
 	"github.com/snowflakedb/gosnowflake"
+	"golang.org/x/exp/slices"
 )
 
 func RoleGrants() *schema.Resource {
@@ -219,6 +220,22 @@ func DeleteRoleGrants(d *schema.ResourceData, meta interface{}) error {
 func revokeRoleFromRole(db *sql.DB, role1, role2 string) error {
 	rg := snowflake.RoleGrant(role1).Role(role2)
 	err := snowflake.Exec(db, rg.Revoke())
+	if driverErr, ok := err.(*gosnowflake.SnowflakeError); ok { //nolint:errorlint // todo: should be fixed
+		if driverErr.Number == 2003 {
+			// handling error if a role has been deleted prior to revoking a role
+			// 002003 (02000): SQL compilation error:
+			// User 'XXX' does not exist or not authorized.
+			roles, _ := snowflake.ListRoles(db, role2)
+			roleNames := make([]string, len(roles))
+			for i, r := range roles {
+				roleNames[i] = r.Name.String
+			}
+			if !slices.Contains(roleNames, role2) {
+				log.Printf("[WARN] Role %s does not exist. No need to revoke role %s", role2, role1)
+				return nil
+			}
+		}
+	}
 	return err
 }