diff --git a/app/autodiscovery/thunderbird/build.gradle.kts b/app/autodiscovery/thunderbird/build.gradle.kts
index 3e8b1f41d..261fe7c7c 100644
--- a/app/autodiscovery/thunderbird/build.gradle.kts
+++ b/app/autodiscovery/thunderbird/build.gradle.kts
@@ -11,4 +11,5 @@ dependencies {
     implementation(libs.okhttp)
 
     testImplementation(libs.kxml2)
+    testImplementation(libs.okhttp.mockwebserver)
 }
diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt
index c4da63191..55440eb21 100644
--- a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt
+++ b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt
@@ -1,5 +1,7 @@
 package com.fsck.k9.autodiscovery.thunderbird
 
+import com.fsck.k9.logging.Timber
+import java.io.IOException
 import java.io.InputStream
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
@@ -8,13 +10,18 @@ import okhttp3.Request
 class ThunderbirdAutoconfigFetcher(private val okHttpClient: OkHttpClient) {
 
     fun fetchAutoconfigFile(url: HttpUrl): InputStream? {
-        val request = Request.Builder().url(url).build()
+        return try {
+            val request = Request.Builder().url(url).build()
 
-        val response = okHttpClient.newCall(request).execute()
+            val response = okHttpClient.newCall(request).execute()
 
-        return if (response.isSuccessful) {
-            response.body?.byteStream()
-        } else {
+            if (response.isSuccessful) {
+                response.body?.byteStream()
+            } else {
+                null
+            }
+        } catch (e: IOException) {
+            Timber.d(e, "Error fetching URL: %s", url)
             null
         }
     }
diff --git a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcherTest.kt b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcherTest.kt
new file mode 100644
index 000000000..770001c1f
--- /dev/null
+++ b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcherTest.kt
@@ -0,0 +1,44 @@
+package com.fsck.k9.autodiscovery.thunderbird
+
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNull
+import kotlin.test.assertNotNull
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.Test
+
+class ThunderbirdAutoconfigFetcherTest {
+    private val fetcher = ThunderbirdAutoconfigFetcher(OkHttpClient.Builder().build())
+
+    @Test
+    fun shouldHandleNonexistentUrl() {
+        val nonExistentUrl =
+            "https://autoconfig.domain.invalid/mail/config-v1.1.xml?emailaddress=test%40domain.example".toHttpUrl()
+
+        val inputStream = fetcher.fetchAutoconfigFile(nonExistentUrl)
+
+        assertThat(inputStream).isNull()
+    }
+
+    @Test
+    fun shouldHandleEmptyResponse() {
+        val server = MockWebServer().apply {
+            this.enqueue(
+                MockResponse()
+                    .setBody("")
+                    .setResponseCode(204),
+            )
+            start()
+        }
+        val url = server.url("/empty/")
+
+        val inputStream = fetcher.fetchAutoconfigFile(url)
+
+        assertNotNull(inputStream) { inputStream ->
+            assertThat(inputStream.available()).isEqualTo(0)
+        }
+    }
+}