diff --git a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
index 0d174825d8062df66f9d687292df2b8a200dfbe1..1d355f5fd8d03b77f32b3104564f365a4c81a508 100644
--- a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
+++ b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
@@ -67,19 +67,17 @@ public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRou
 	private final Function<InputStream, CompletableFuture<File>> fileSaver;
 	private final Consumer<FormData> formDataConsumer;
 	private final Consumer<GrpcRouteForwardingResponse> responseConsumer;
-	private final Consumer<Throwable> onErrorHandler;
 
 	@Builder
 	public EingangStubReceiverStreamObserver(RouteForwardingMapper routeForwardingMapper, IncomingFileMapper incomingFileMapper,
 			IncomingFileGroupMapper incomingFileGroupMapper, Function<InputStream, CompletableFuture<File>> fileSaver,
-			Consumer<FormData> formDataConsumer, Consumer<GrpcRouteForwardingResponse> responseConsumer, Consumer<Throwable> onErrorHandler) {
+			Consumer<FormData> formDataConsumer, Consumer<GrpcRouteForwardingResponse> responseConsumer) {
 		this.routeForwardingMapper = routeForwardingMapper;
 		this.incomingFileMapper = incomingFileMapper;
 		this.incomingFileGroupMapper = incomingFileGroupMapper;
 		this.fileSaver = fileSaver;
 		this.formDataConsumer = formDataConsumer;
 		this.responseConsumer = responseConsumer;
-		this.onErrorHandler = onErrorHandler;
 	}
 
 	private FormData formData;
@@ -204,7 +202,6 @@ public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRou
 		LOG.error("Error happened. Receiving stream closed.", t);
 		closeOutputPipe();
 		closeInputPipe();
-		onErrorHandler.accept(t);
 	}
 
 	void closeOutputPipe() {
diff --git a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcService.java b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcService.java
index d08d98e8e80cfd0d7fcf94400640dcfd0e32c49e..322e7361ff4f3cc58808e60e14cd3103eab90804 100644
--- a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcService.java
+++ b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcService.java
@@ -52,7 +52,6 @@ public class RouteForwardingGrpcService extends RouteForwardingServiceGrpc.Route
 				.incomingFileGroupMapper(incomingFileGroupMapper)
 				.formDataConsumer(routeForwardingService::route)
 				.responseConsumer(repsonse -> respondWith(responseObserver, repsonse))
-				.onErrorHandler(error -> handleError(error, responseObserver))
 				.build();
 	}
 
@@ -65,8 +64,4 @@ public class RouteForwardingGrpcService extends RouteForwardingServiceGrpc.Route
 		responseObserver.onCompleted();
 	}
 
-	public void handleError(Throwable error, StreamObserver<GrpcRouteForwardingResponse> responseObserver) {
-		responseObserver.onError(error);
-	}
-
 }
diff --git a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java
index fc502fe69fbf94b6e9fd558f95d0bbced25b0118..d14d99362f0f9d61e80448a4a0a196137607ab55 100644
--- a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java
+++ b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java
@@ -76,8 +76,6 @@ class EingangStubReceiverStreamObserverTest {
 	private Consumer<FormData> formDataConsumer;
 	@Mock
 	private Consumer<GrpcRouteForwardingResponse> responseConsumer;
-	@Mock
-	private Consumer<Throwable> onErrorHandler;
 
 	@BeforeEach
 	void setUp() {
@@ -88,7 +86,6 @@ class EingangStubReceiverStreamObserverTest {
 				.incomingFileGroupMapper(incomingFileGroupMapper)
 				.formDataConsumer(formDataConsumer)
 				.responseConsumer(responseConsumer)
-				.onErrorHandler(onErrorHandler)
 				.build());
 	}
 
@@ -830,15 +827,6 @@ class EingangStubReceiverStreamObserverTest {
 
 			verify(observer).closeInputPipe();
 		}
-
-		@Test
-		void shouldCallOnErrorHandler() {
-			var exception = new Exception();
-
-			observer.onError(exception);
-
-			verify(onErrorHandler).accept(exception);
-		}
 	}
 
 	@Nested
diff --git a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcServiceTest.java b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcServiceTest.java
index 5c94fb60b1e4ee0c1caf87fe702025e0291cb206..35ac8140ce6cc4b7acd21cca3f6a0e15b06649dc 100644
--- a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcServiceTest.java
+++ b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcServiceTest.java
@@ -122,16 +122,6 @@ class RouteForwardingGrpcServiceTest {
 			verify(service).respondWith(responseObserver, GrpcRouteForwardingResponse.getDefaultInstance());
 		}
 
-		@Test
-		void shouldSetOnErrorHandler() {
-			var error = new Throwable();
-
-			var observer = service.routeForwarding(responseObserver);
-
-			callOnErrorHandler(observer, error);
-			verify(service).handleError(error, responseObserver);
-		}
-
 		@SuppressWarnings("unchecked")
 		private void callFileSaver(StreamObserver<GrpcRouteForwardingRequest> uploadObserver) {
 			var fileSaver = (Function<InputStream, CompletableFuture<File>>) ReflectionTestUtils.getField(uploadObserver, "fileSaver");
@@ -139,15 +129,18 @@ class RouteForwardingGrpcServiceTest {
 		}
 
 		private RouteForwardingMapper getRouteForwardingMapper(StreamObserver<GrpcRouteForwardingRequest> uploadObserver) {
-			return (RouteForwardingMapper) ReflectionTestUtils.getField(uploadObserver, "routeForwardingMapper");
+			var routeForwardingMapper = (RouteForwardingMapper) ReflectionTestUtils.getField(uploadObserver, "routeForwardingMapper");
+			return routeForwardingMapper;
 		}
 
 		private IncomingFileMapper getIncomingFileMapper(StreamObserver<GrpcRouteForwardingRequest> uploadObserver) {
-			return (IncomingFileMapper) ReflectionTestUtils.getField(uploadObserver, "incomingFileMapper");
+			var incomingFileMapper = (IncomingFileMapper) ReflectionTestUtils.getField(uploadObserver, "incomingFileMapper");
+			return incomingFileMapper;
 		}
 
 		private IncomingFileGroupMapper getIncomingFileGroupMapper(StreamObserver<GrpcRouteForwardingRequest> uploadObserver) {
-			return (IncomingFileGroupMapper) ReflectionTestUtils.getField(uploadObserver, "incomingFileGroupMapper");
+			var incomingFileGroupMapper = (IncomingFileGroupMapper) ReflectionTestUtils.getField(uploadObserver, "incomingFileGroupMapper");
+			return incomingFileGroupMapper;
 		}
 
 		@SuppressWarnings("unchecked")
@@ -161,12 +154,6 @@ class RouteForwardingGrpcServiceTest {
 			var responseConsumer = (Consumer<GrpcRouteForwardingResponse>) ReflectionTestUtils.getField(uploadObserver, "responseConsumer");
 			responseConsumer.accept(response);
 		}
-
-		@SuppressWarnings("unchecked")
-		private void callOnErrorHandler(StreamObserver<GrpcRouteForwardingRequest> uploadObserver, Throwable throwable) {
-			var onErrorHandler = (Consumer<Throwable>) ReflectionTestUtils.getField(uploadObserver, "onErrorHandler");
-			onErrorHandler.accept(throwable);
-		}
 	}
 
 	@Nested
@@ -218,20 +205,4 @@ class RouteForwardingGrpcServiceTest {
 			inOrder.verify(responseObserver).onCompleted();
 		}
 	}
-
-	@Nested
-	class TestHandleError {
-
-		@Mock
-		private StreamObserver<GrpcRouteForwardingResponse> responseObserver;
-
-		@Test
-		void shouldDoNothing() {
-			var error = new Throwable();
-
-			service.handleError(error, responseObserver);
-
-			verify(responseObserver).onError(error);
-		}
-	}
 }