From 4d8a680c39d1ba6781a5c2507aaaa1e46a15c242 Mon Sep 17 00:00:00 2001
From: Matt Dale <9760375+matthewdale@users.noreply.github.com>
Date: Thu, 30 Jan 2025 12:31:50 -0800
Subject: [PATCH] Fix erroneous nil error return in FindOne. (#1926)

(cherry picked from commit 8eb83cb0ae9b296bd918565b6e5b01571c606ec1)
---
 mongo/collection.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongo/collection.go b/mongo/collection.go
index 3489f12f4f..988942e871 100644
--- a/mongo/collection.go
+++ b/mongo/collection.go
@@ -1549,7 +1549,7 @@ func (coll *Collection) FindOne(ctx context.Context, filter interface{},
 
 	args, err := mongoutil.NewOptions(opts...)
 	if err != nil {
-		return nil
+		return &SingleResult{err: err}
 	}
 	cursor, err := coll.find(ctx, filter, false, newFindArgsFromFindOneArgs(args))
 	return &SingleResult{