diff --git a/Sources/SparkConnect/ArrowReader.swift b/Sources/SparkConnect/ArrowReader.swift
index 8a98db9..665f8c9 100644
--- a/Sources/SparkConnect/ArrowReader.swift
+++ b/Sources/SparkConnect/ArrowReader.swift
@@ -298,10 +298,8 @@ public class ArrowReader {  // swiftlint:disable:this type_body_length
             messageEndOffset: messageEndOffset
           ).get()
           result.batches.append(recordBatch)
-        } catch let error as ArrowError {
+        } catch let error {
           return .failure(error)
-        } catch {
-          return .failure(.unknownError("Unexpected error: \(error)"))
         }
       default:
         return .failure(.unknownError("Unhandled header type: \(message.headerType)"))
@@ -361,10 +359,8 @@ public class ArrowReader {  // swiftlint:disable:this type_body_length
         ).get()
         result.batches.append(recordBatch)
         return .success(())
-      } catch let error as ArrowError {
+      } catch let error {
         return .failure(error)
-      } catch {
-        return .failure(.unknownError("Unexpected error: \(error)"))
       }
 
     default:
diff --git a/Tests/SparkConnectTests/RuntimeConfTests.swift b/Tests/SparkConnectTests/RuntimeConfTests.swift
index 92d3ed2..ae891a8 100644
--- a/Tests/SparkConnectTests/RuntimeConfTests.swift
+++ b/Tests/SparkConnectTests/RuntimeConfTests.swift
@@ -31,7 +31,7 @@ struct RuntimeConfTests {
     _ = try await client.connect(UUID().uuidString)
     let conf = RuntimeConf(client)
 
-    #expect(try await conf.get("spark.app.name") != nil)
+    #expect(try await !conf.get("spark.app.name").isEmpty)
 
     try await #require(throws: Error.self) {
       try await conf.get("spark.test.non-exist")