diff --git a/pkg/errhelp/errors.go b/pkg/errhelp/errors.go
index 122cebf37ba..7b148af36a7 100644
--- a/pkg/errhelp/errors.go
+++ b/pkg/errhelp/errors.go
@@ -14,6 +14,10 @@ const (
 )
 
 func NewAzureError(err error) error {
+
+	if err == nil {
+		return nil
+	}
 	ae := AzureError{
 		Original: err,
 	}
diff --git a/pkg/resourcemanager/sqlclient/sqlclient_godsk.go b/pkg/resourcemanager/sqlclient/sqlclient_godsk.go
index 072638344d4..a6fad539b4a 100644
--- a/pkg/resourcemanager/sqlclient/sqlclient_godsk.go
+++ b/pkg/resourcemanager/sqlclient/sqlclient_godsk.go
@@ -64,7 +64,7 @@ func (sdk GoSDKClient) CreateOrUpdateSQLServer(properties SQLServerProperties) (
 		sdk.ResourceGroupName,
 		sdk.ServerName,
 		sql.Server{
-			Location:         to.StringPtr(config.Location()),
+			Location:         to.StringPtr(sdk.Location),
 			ServerProperties: &serverProp,
 		})
 	if err != nil {
@@ -257,7 +257,7 @@ func (sdk GoSDKClient) GetServer(rgroup, name string) (sql.Server, error) {
 
 	return serversClient.Get(
 		sdk.Ctx,
-		sdk.ResourceGroupName,
-		sdk.ServerName,
+		rgroup,
+		name,
 	)
 }