diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs
index 1d7dea4d..17a7f6ac 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseHelper.cs
@@ -32,20 +32,38 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation
         public RestoreConfigInfoResponse CreateConfigInfoResponse(RestoreConfigInfoRequestParams restoreConfigInfoRequest)
         {
             RestoreConfigInfoResponse response = new RestoreConfigInfoResponse();
-            RestoreDatabaseTaskDataObject restoreTaskObject = CreateRestoreForNewSession(restoreConfigInfoRequest.OwnerUri);
-            if (restoreTaskObject != null)
+            RestoreDatabaseTaskDataObject restoreTaskObject = null;
+            
+            try
             {
-                // Default Data folder path in the target server
-                response.ConfigInfo.Add(RestoreOptionsHelper.DataFileFolder, restoreTaskObject.DefaultDataFileFolder);
-                // Default log folder path in the target server
-                response.ConfigInfo.Add(RestoreOptionsHelper.LogFileFolder, restoreTaskObject.DefaultLogFileFolder);
-                // The db names with backup set
-                response.ConfigInfo.Add(RestoreOptionsHelper.SourceDatabaseNamesWithBackupSets, restoreTaskObject.GetDatabaseNamesWithBackupSets());
-                // Default backup folder path in the target server
-                response.ConfigInfo.Add(RestoreOptionsHelper.DefaultBackupFolder, restoreTaskObject.DefaultBackupFolder);
+                restoreTaskObject = CreateRestoreForNewSession(restoreConfigInfoRequest.OwnerUri);
+                if (restoreTaskObject != null)
+                {
+                    // Default Data folder path in the target server
+                    response.ConfigInfo.Add(RestoreOptionsHelper.DataFileFolder, restoreTaskObject.DefaultDataFileFolder);
+                    // Default log folder path in the target server
+                    response.ConfigInfo.Add(RestoreOptionsHelper.LogFileFolder, restoreTaskObject.DefaultLogFileFolder);
+                    // The db names with backup set
+                    response.ConfigInfo.Add(RestoreOptionsHelper.SourceDatabaseNamesWithBackupSets, restoreTaskObject.GetDatabaseNamesWithBackupSets());
+                    // Default backup folder path in the target server
+                    response.ConfigInfo.Add(RestoreOptionsHelper.DefaultBackupFolder, restoreTaskObject.DefaultBackupFolder);
+                }
+            }
+            catch(Exception ex) 
+            {
+                Logger.Write(LogLevel.Warning, $"Failed to create restore config info. error: { ex.Message}");
+                response.ErrorMessage = ex.Message;
+            }
+            finally
+            {
+                ServerConnection serverConnection = restoreTaskObject?.Server?.ConnectionContext;
+                if (serverConnection != null && serverConnection.IsOpen)
+                {
+                    restoreTaskObject.Server.ConnectionContext.Disconnect();
+                }
             }
-
             return response;
+            
         }
 
         /// <summary>
@@ -174,23 +192,7 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation
 
             if (connInfo != null)
             {
-                SqlConnection connection;
-                DbConnection dbConnection = connInfo.AllConnections.First();
-                ReliableSqlConnection reliableSqlConnection = dbConnection as ReliableSqlConnection;
-                SqlConnection sqlConnection = dbConnection as SqlConnection;
-                if (reliableSqlConnection != null)
-                {
-                    connection = reliableSqlConnection.GetUnderlyingConnection();
-                }
-                else if (sqlConnection != null)
-                {
-                    connection = sqlConnection;
-                }
-                else
-                {
-                    Logger.Write(LogLevel.Warning, "Cannot find any sql connection for restore operation");
-                    return null;
-                }
+                SqlConnection connection = ConnectionService.OpenSqlConnection(connInfo, "Restore");
                 Server server = new Server(new ServerConnection(connection));
 
                 RestoreDatabaseTaskDataObject restoreDataObject = new RestoreDatabaseTaskDataObject(server, targetDatabaseName);
diff --git a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs
index f1e59472..d77fcbe8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/DisasterRecovery/RestoreOperation/RestoreDatabaseTaskDataObject.cs
@@ -794,7 +794,7 @@ namespace Microsoft.SqlTools.ServiceLayer.DisasterRecovery.RestoreOperation
         /// <returns></returns>
         private string GetTargetDbFilePhysicalName(string sourceDbFilePhysicalLocation)
         {
-            string pathSeparator = PathWrapper.PathSeparatorFromServerConnection(Server.ConnectionContext);
+            string pathSeparator = Path.DirectorySeparatorChar.ToString();
             sourceDbFilePhysicalLocation = sourceDbFilePhysicalLocation.Replace("/", pathSeparator);
             sourceDbFilePhysicalLocation = sourceDbFilePhysicalLocation.Replace("\\", pathSeparator);
             string fileName = Path.GetFileName(sourceDbFilePhysicalLocation);