diff --git a/builtin/providers/aws/config.go b/builtin/providers/aws/config.go
index 6ae8a254b7..952fe7ac6b 100644
--- a/builtin/providers/aws/config.go
+++ b/builtin/providers/aws/config.go
@@ -232,7 +232,7 @@ func (c *Config) Client() (interface{}, error) {
 
 	authErr := c.ValidateAccountId(client.accountid)
 	if authErr != nil {
-		return nil, err
+		return nil, authErr
 	}
 
 	client.apigateway = apigateway.New(sess)