From f9a522e15809d85a71972b383cf4762b08368210 Mon Sep 17 00:00:00 2001
From: Melih Aydogdu <melih.aydogdu@formelio.nl>
Date: Mon, 27 May 2024 15:00:08 +0200
Subject: [PATCH] null check added

---
 .../java/ca/uhn/fhir/rest/client/impl/GenericClient.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java
index ae0cd079306..364a3283dda 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java
@@ -600,8 +600,12 @@ public class GenericClient extends BaseClient implements IGenericClient {
 			if (resp instanceof IBaseBundle) {
 				List<SearchBundleEntryParts> searchBundleEntryParts =
 						BundleUtil.getSearchBundleEntryParts(getFhirContext(), (IBaseBundle) resp);
-				searchBundleEntryParts.forEach(searchBundleEntryPart -> ResourceMetadataKeyEnum.ENTRY_SEARCH_MODE.put(
-						searchBundleEntryPart.getResource(), searchBundleEntryPart.getSearchMode()));
+				searchBundleEntryParts.forEach(searchBundleEntryPart -> {
+					IBaseResource resource = searchBundleEntryPart.getResource();
+					if (resource != null) {
+						ResourceMetadataKeyEnum.ENTRY_SEARCH_MODE.put(resource, searchBundleEntryPart.getSearchMode());
+					}
+				});
 			}
 			return resp;
 		}