diff --git a/cli/command_policy_set.go b/cli/command_policy_set.go
index fcf570fc5..b63571f33 100644
--- a/cli/command_policy_set.go
+++ b/cli/command_policy_set.go
@@ -82,8 +82,12 @@ func setPolicy(ctx context.Context, rep *repo.Repository) error {
 
 	for _, target := range targets {
 		p, err := policy.GetDefinedPolicy(ctx, rep, target)
-		if err == policy.ErrPolicyNotFound {
+
+		switch {
+		case err == policy.ErrPolicyNotFound:
 			p = &policy.Policy{}
+		case err != nil:
+			return errors.Wrap(err, "could not get defined policy")
 		}
 
 		printStderr("Setting policy for %v\n", target)