diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index e1316e2dc9fd21cbc5d5b7935c52149caa29ce19..9f685befffa99f6f9271639b33148db166a8e802 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -27,6 +27,7 @@ use std::{
 };
 use theme::SyntaxTheme;
 use tree_sitter::{self, Query};
+use util::ResultExt;
 
 #[cfg(any(test, feature = "test-support"))]
 use futures::channel::mpsc;
@@ -240,7 +241,8 @@ impl LanguageRegistry {
         let download_dir = self
             .language_server_download_dir
             .clone()
-            .expect("language server download directory has not been assigned");
+            .ok_or_else(|| anyhow!("language server download directory has not been assigned"))
+            .log_err()?;
 
         let lsp_ext = language.lsp_ext.clone()?;
         let background = cx.background().clone();