From 372314aa23456814a6cd6a8f8cf8793b97cfbd64 Mon Sep 17 00:00:00 2001
From: Michael Reiche <48999328+mikereiche@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:53:20 -0700
Subject: [PATCH] Check for nulls. (#1723)

Closes #1720.
---
 .../data/couchbase/core/convert/OtherConverters.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java b/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java
index 71f2ebaa..9bedf467 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/OtherConverters.java
@@ -28,6 +28,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 import com.couchbase.client.java.json.JsonArray;
@@ -339,7 +340,7 @@ public final class OtherConverters {
 
 		@Override
 		public String convert(YearMonth source) {
-			return source.toString();
+			return Optional.ofNullable(source).map(YearMonth::toString).orElse(null);
 		}
 	}
 
@@ -350,7 +351,7 @@ public final class OtherConverters {
 
 		@Override
 		public YearMonth convert(String source) {
-			return YearMonth.parse(source);
+			return Optional.ofNullable(source).map(YearMonth::parse).orElse(null);
 		}
 	}