diff --git a/pr_agent/git_providers/azuredevops_provider.py b/pr_agent/git_providers/azuredevops_provider.py
index cd0b88ca..e0f4760d 100644
--- a/pr_agent/git_providers/azuredevops_provider.py
+++ b/pr_agent/git_providers/azuredevops_provider.py
@@ -100,14 +100,18 @@ class AzureDevopsProvider:
                     continue
 
                 version = GitVersionDescriptor(version=head_sha.commit_id, version_type='commit')
-                new_file_content_str = self.azure_devops_client.get_item(repository_id=self.repo_slug,
-                                                                         path=file,
-                                                                         project=self.workspace_slug,
-                                                                         version_descriptor=version,
-                                                                         download=False,
-                                                                         include_content=True)
+                try:
+                    new_file_content_str = self.azure_devops_client.get_item(repository_id=self.repo_slug,
+                                                                            path=file,
+                                                                            project=self.workspace_slug,
+                                                                            version_descriptor=version,
+                                                                            download=False,
+                                                                            include_content=True)
 
-                new_file_content_str = new_file_content_str.content
+                    new_file_content_str = new_file_content_str.content
+                except Exception as error:
+                    logging.error("Failed to retrieve new file content of %s at version %s. Error: %s", file, version, str(error))
+                    new_file_content_str = ""
 
                 edit_type = EDIT_TYPE.MODIFIED
                 if diff_types[file] == 'add':
@@ -118,13 +122,17 @@ class AzureDevopsProvider:
                     edit_type = EDIT_TYPE.RENAMED
 
                 version = GitVersionDescriptor(version=base_sha.commit_id, version_type='commit')
-                original_file_content_str = self.azure_devops_client.get_item(repository_id=self.repo_slug,
+                try:
+                    original_file_content_str = self.azure_devops_client.get_item(repository_id=self.repo_slug,
                                                                               path=file,
                                                                               project=self.workspace_slug,
                                                                               version_descriptor=version,
                                                                               download=False,
                                                                               include_content=True)
-                original_file_content_str = original_file_content_str.content
+                    original_file_content_str = original_file_content_str.content
+                except Exception as error:
+                    logging.error("Failed to retrieve original file content of %s at version %s. Error: %s", file, version, str(error))
+                    original_file_content_str = ""
 
                 patch = load_large_diff(file, new_file_content_str, original_file_content_str)