diff --git a/pr_agent/tools/pr_code_suggestions.py b/pr_agent/tools/pr_code_suggestions.py
index 97c183f2..1456f9a6 100644
--- a/pr_agent/tools/pr_code_suggestions.py
+++ b/pr_agent/tools/pr_code_suggestions.py
@@ -190,7 +190,8 @@ class PRCodeSuggestions:
             original_initial_line = None
             for file in self.diff_files:
                 if file.filename.strip() == relevant_file:
-                    original_initial_line = file.head_file.splitlines()[relevant_lines_start - 1]
+                    if file.head_file:  # in bitbucket, head_file is empty. toDo: fix this
+                        original_initial_line = file.head_file.splitlines()[relevant_lines_start - 1]
                     break
             if original_initial_line:
                 suggested_initial_line = new_code_snippet.splitlines()[0]
diff --git a/pr_agent/tools/pr_description.py b/pr_agent/tools/pr_description.py
index 0cc32b7f..5eb78549 100644
--- a/pr_agent/tools/pr_description.py
+++ b/pr_agent/tools/pr_description.py
@@ -113,16 +113,21 @@ class PRDescription:
 
             if get_settings().config.publish_output:
                 get_logger().info(f"Pushing answer {self.pr_id}")
+
+                # publish labels
+                if get_settings().pr_description.publish_labels and self.git_provider.is_supported("get_labels"):
+                    current_labels = self.git_provider.get_pr_labels()
+                    user_labels = get_user_labels(current_labels)
+                    self.git_provider.publish_labels(pr_labels + user_labels)
+
+                # publish description
                 if get_settings().pr_description.publish_description_as_comment:
                     get_logger().info(f"Publishing answer as comment")
                     self.git_provider.publish_comment(full_markdown_description)
                 else:
                     self.git_provider.publish_description(pr_title, pr_body)
-                    if get_settings().pr_description.publish_labels and self.git_provider.is_supported("get_labels"):
-                        current_labels = self.git_provider.get_pr_labels()
-                        user_labels = get_user_labels(current_labels)
-                        self.git_provider.publish_labels(pr_labels + user_labels)
 
+                    # publish final update message
                     if (get_settings().pr_description.final_update_message and
                             hasattr(self.git_provider, 'pr_url') and self.git_provider.pr_url):
                         latest_commit_url = self.git_provider.get_latest_commit_url()