diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 28a5157c..eaa63e93 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -220,7 +220,7 @@ impl Completion {
                     {
                         Some(ls) => ls,
                         None => {
-                            editor.set_error("language server disappeared between completion request and application");
+                            editor.set_error("completions are outdated");
                             // TODO close the completion menu somehow,
                             // currently there is no trivial way to access the EditorView to close the completion menu
                             return;
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 280002bd..1f27603c 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1353,10 +1353,10 @@ impl Editor {
             }
             doc.set_version_control_head(self.diff_providers.get_current_head_name(&path));
 
-            let doc_id = self.new_document(doc);
-            let _ = self.launch_language_servers(doc_id);
+            let id = self.new_document(doc);
+            let _ = self.launch_language_servers(id);
 
-            doc_id
+            id
         };
 
         self.switch(id, action);
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index d11cbe4d..a332a8a3 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -66,9 +66,6 @@ pub fn diagnostic<'doc>(
             }
             use helix_core::diagnostic::Severity;
             let first_diag_idx_maybe_on_line = diagnostics.partition_point(|d| d.line < line);
-            if first_diag_idx_maybe_on_line == diagnostics.len() {
-                return None;
-            }
             let diagnostics_on_line = diagnostics[first_diag_idx_maybe_on_line..]
                 .iter()
                 .take_while(|d| {