diff --git a/samples/grpc-reactive/src/main/java/org/springframework/grpc/sample/GrpcServerApplication.java b/samples/grpc-reactive/src/main/java/org/springframework/grpc/sample/GrpcServerApplication.java
index 91ed5dd..69c0b17 100644
--- a/samples/grpc-reactive/src/main/java/org/springframework/grpc/sample/GrpcServerApplication.java
+++ b/samples/grpc-reactive/src/main/java/org/springframework/grpc/sample/GrpcServerApplication.java
@@ -1,13 +1,35 @@
 package org.springframework.grpc.sample;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.grpc.server.exception.GrpcExceptionHandler;
+import org.springframework.grpc.server.exception.ReactiveStubBeanDefinitionRegistrar;
+
+import io.grpc.Status;
 
 @SpringBootApplication
+@Import(ReactiveStubBeanDefinitionRegistrar.class)
 public class GrpcServerApplication {
 
+	private static Log log = LogFactory.getLog(GrpcServerApplication.class);
+
 	public static void main(String[] args) {
 		SpringApplication.run(GrpcServerApplication.class, args);
 	}
 
+	@Bean
+	GrpcExceptionHandler grpcExceptionHandler() {
+		return ex -> {
+			if (ex instanceof IllegalArgumentException) {
+				log.error("Error in grpc exception", ex);
+				return Status.INVALID_ARGUMENT.withDescription(ex.getMessage());
+			}
+			return Status.INTERNAL.withCause(ex).withDescription(ex.getMessage());
+		};
+	}
+
 }
diff --git a/samples/grpc-reactive/src/main/resources/application.properties b/samples/grpc-reactive/src/main/resources/application.properties
index 6ed227d..5550549 100644
--- a/samples/grpc-reactive/src/main/resources/application.properties
+++ b/samples/grpc-reactive/src/main/resources/application.properties
@@ -1 +1,2 @@
 spring.application.name=grpc-reactive
+#logging.level.org.springframework.beans.factory.support.CglibSubclassingInstantiationStrategy=TRACE
\ No newline at end of file
diff --git a/spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/ReactiveStubBeanDefinitionRegistrar.java b/spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/ReactiveStubBeanDefinitionRegistrar.java
new file mode 100644
index 0000000..2cfe3ce
--- /dev/null
+++ b/spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/ReactiveStubBeanDefinitionRegistrar.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.grpc.server.exception;
+
+import java.lang.reflect.Method;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.MethodReplacer;
+import org.springframework.beans.factory.support.ReplaceOverride;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.util.ReflectionUtils;
+
+import io.grpc.BindableService;
+import io.grpc.Status;
+import io.grpc.StatusException;
+
+/**
+ * A {@link BeanFactoryPostProcessor} and {@link MethodReplacer} that processes beans of
+ * type {@link BindableService} to replace their {@code onErrorMap} method to a set of
+ * {@link GrpcExceptionHandler} beans.
+ *
+ * @author Dave Syer
+ */
+public class ReactiveStubBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar {
+
+	@Override
+	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
+		if (registry.containsBeanDefinition(ReactiveStubBeanFactoryPostProcessor.BEAN_NAME)) {
+			return;
+		}
+		registry.registerBeanDefinition(ReactiveStubBeanFactoryPostProcessor.BEAN_NAME,
+				BeanDefinitionBuilder.genericBeanDefinition(ReactiveStubBeanFactoryPostProcessor.class).getBeanDefinition());
+	}
+
+}
+
+class ReactiveStubBeanFactoryPostProcessor implements BeanFactoryPostProcessor, MethodReplacer, ApplicationContextAware {
+
+	/**
+	 * Bean name for this post processor in the application context.
+	 */
+	public static final String BEAN_NAME = ReactiveStubBeanFactoryPostProcessor.class.getName();
+
+	private CompositeGrpcExceptionHandler handler;
+
+	private ApplicationContext context;
+	
+	@Override
+	public void setApplicationContext(ApplicationContext context) throws BeansException {
+		this.context = context;
+	}
+
+	private Throwable onErrorMap(Throwable throwable) {
+		if (this.handler == null) {
+			GrpcExceptionHandler[] handlers = this.context.getAutowireCapableBeanFactory()
+				.getBeanProvider(GrpcExceptionHandler.class)
+				.orderedStream()
+				.toArray(GrpcExceptionHandler[]::new);
+			this.handler = new CompositeGrpcExceptionHandler(handlers);
+		}
+		Status status = handler.handleException(throwable);
+		return status != null ? new StatusException(status) : throwable;
+	}
+
+	@Override
+	public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) {
+		if (this.context.getBeanNamesForType(GrpcExceptionHandler.class).length == 0) {
+			return;
+		}
+		for (String name : factory.getBeanNamesForType(BindableService.class)) {
+			BeanDefinition service = factory.getBeanDefinition(name);
+			Class<?> type = factory.getType(name);
+			if (type != null && ReflectionUtils.findMethod(type, "onErrorMap", Throwable.class) != null) {
+				if (service instanceof AbstractBeanDefinition root) {
+					ReplaceOverride override = new ReplaceOverride("onErrorMap", BEAN_NAME);
+					// You need this in an AOT build (but the interceptor still isn't used
+					// at runtime with AOT
+					// https://github.com/spring-projects/spring-framework/issues/34642)
+					override.addTypeIdentifier("Throwable");
+					root.getMethodOverrides().addOverride(override);
+				}
+			}
+		}
+	}
+
+	@Override
+	public Object reimplement(Object obj, Method method, Object[] args) throws Throwable {
+		return onErrorMap((Throwable) args[0]);
+	}
+
+}
\ No newline at end of file