diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteService.java
index 18a53bf2f6eab06f98c281e36f25a96efe886f8a..63323fb8ecb106b710574deed664efbc70c3be1f 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteService.java
@@ -81,9 +81,9 @@ class ForwardingRemoteService {
 		try {
 			sendEingang(request, requestStreamObserver);
 			requestStreamObserver.onCompleted();
-		} catch (Throwable t) {
-			requestStreamObserver.onError(t);
-			throw t;
+		} catch (Exception e) {
+			requestStreamObserver.onError(e);
+			throw e;
 		}
 	}
 
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteServiceTest.java
index 175a515febee5f39cae88681c17750ae3c857d79..5e6e63b58402a779cb7716609f773772e50b2342 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRemoteServiceTest.java
@@ -160,7 +160,7 @@ class ForwardingRemoteServiceTest {
 
 			routeForwarding();
 
-			verify(serviceStub).routeForwarding(any(ForwardingResponseObserver.class));
+			verify(serviceStub).routeForwarding(responseObserver);
 		}
 
 		@Nested