diff --git a/src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessor.cs b/src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessor.cs
index 0bd7320a5..d91f9ab25 100644
--- a/src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessor.cs
+++ b/src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessor.cs
@@ -228,7 +228,7 @@ private IEnumerable<TaskGroup> FilterOutIncompatibleTaskGroups(IEnumerable<TaskG
                 {
                     Log.LogWarning(
                         @"{DefinitionType} ""{DefinitionName}"" cannot be migrated because the Task(s) ""{MissingTaskNames}"" are not available. This usually happens if the extension for the task is not installed.",
-                        typeof(TaskGroup).Name, g.Name ,string.Join(",", missingTasksNames));
+                        typeof(TaskGroup).Name, g.Name, string.Join(",", missingTasksNames));
                     return false;
                 }
                 return true;
@@ -303,13 +303,15 @@ private async Task<IEnumerable<Mapping>> CreateBuildPipelinesAsync(IEnumerable<M
             // Replace taskgroup and variablegroup sIds with tIds
             foreach (var definitionToBeMigrated in definitionsToBeMigrated)
             {
-                var sourceConnectedServiceId = definitionToBeMigrated.Repository.Properties.ConnectedServiceId;
+                var sourceConnectedServiceId = definitionToBeMigrated.Repository?.Properties?.ConnectedServiceId;
                 var targetConnectedServiceId = targetServiceConnections.FirstOrDefault(s => sourceServiceConnections
                     .FirstOrDefault(c => c.Id == sourceConnectedServiceId)?.Name == s.Name)?.Id;
-                definitionToBeMigrated.Repository.Properties.ConnectedServiceId = targetConnectedServiceId;
 
-
-                MapRepositoriesInBuidDefinition(sourceRepositories, targetRepositories, definitionToBeMigrated);
+                if (definitionToBeMigrated.Repository?.Properties != null)
+                {
+                    definitionToBeMigrated.Repository.Properties.ConnectedServiceId = targetConnectedServiceId;
+                    MapRepositoriesInBuidDefinition(sourceRepositories, targetRepositories, definitionToBeMigrated);
+                }
 
                 if (TaskGroupMapping is not null)
                 {