diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java
index 74036370..46aa4226 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java
@@ -42,6 +42,7 @@ import org.springframework.data.gemfire.mapping.GemfirePersistentProperty;
 import org.springframework.data.gemfire.repository.query.GemfireRepositoryQuery;
 import org.springframework.data.gemfire.repository.query.QueryPostProcessor;
 import org.springframework.data.gemfire.util.CollectionUtils;
+import org.springframework.data.gemfire.util.SpringUtils;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.RepositoryDefinition;
@@ -256,13 +257,7 @@ public class GemfireRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
 	 * @see org.springframework.data.mapping.context.MappingContext
 	 */
 	protected MappingContext<? extends GemfirePersistentEntity<?>, GemfirePersistentProperty> resolveGemfireMappingContext() {
-
-		MappingContext<? extends GemfirePersistentEntity<?>, GemfirePersistentProperty> mappingContext =
-			getGemfireMappingContext();
-
-		Assert.state(mappingContext != null, "GemfireMappingContext must not be null");
-
-		return mappingContext;
+		return SpringUtils.requireObject(this::getGemfireMappingContext, "GemfireMappingContext must not be null");
 	}
 
 	protected class QueryPostProcessorRegistrationOnQueryCreationListener