diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandModelAssemblerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandModelAssemblerTest.java
index cdc84e3c2bb10c6620376542e304399ff8ea0cfb..bd98a6b0274afd52ed736ae3a742674401ff45ca 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandModelAssemblerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandModelAssemblerTest.java
@@ -226,7 +226,7 @@ class CommandModelAssemblerTest {
 					"UPDATE_ATTACHED_ITEM", "PATCH_ATTACHED_ITEM", "RECEIVE_POSTFACH_NACHRICHT", "VORGANG_LOESCHEN", "DELETE_ATTACHED_ITEM",
 					"VORGANG_ZUM_LOESCHEN_MARKIEREN", "LOESCH_ANFORDERUNG_ZURUECKNEHMEN", "CREATE_BESCHEID", "PROCESS_VORGANG", "SET_AKTENZEICHEN",
 					"DELETE_BESCHEID", "UPDATE_BESCHEID", "CREATE_BESCHEID_DOCUMENT_FROM_FILE", "CREATE_BESCHEID_DOCUMENT", "SEND_BESCHEID",
-					"UNBEKANNT", "CREATE_COLLABORATION_REQUEST" })
+					"UNBEKANNT", "CREATE_COLLABORATION_REQUEST", "FORWARD_VORGANG" })
 			void shouldBePresentOnOrder(CommandOrder order) {
 				var model = toModelWithOrder(order.name());
 
@@ -250,7 +250,7 @@ class CommandModelAssemblerTest {
 		@ParameterizedTest
 		@EnumSource(mode = Mode.EXCLUDE, names = { "VORGANG_ANNEHMEN", "VORGANG_VERWERFEN", "VORGANG_ZURUECKHOLEN", "VORGANG_BEARBEITEN",
 				"VORGANG_BESCHEIDEN", "VORGANG_ZURUECKSTELLEN", "VORGANG_ABSCHLIESSEN", "VORGANG_WIEDEREROEFFNEN", "VORGANG_ZUM_LOESCHEN_MARKIEREN",
-				"LOESCH_ANFORDERUNG_ZURUECKNEHMEN" })
+				"LOESCH_ANFORDERUNG_ZURUECKNEHMEN", "FORWARD_VORGANG" })
 		void shouldNOTBePresentOnOrder(CommandOrder order) {
 			var model = toModelWithOrder(order.name());
 
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardByVorgangCommandControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardByVorgangCommandControllerTest.java
index 196916013cc0773203ec71b28db595a4b0bce594..d048bea2da6737fd5431416bc760977c7de3d093 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardByVorgangCommandControllerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/forwarding/ForwardByVorgangCommandControllerTest.java
@@ -51,8 +51,9 @@ import de.ozgcloud.alfa.common.command.CommandOrder;
 import de.ozgcloud.alfa.common.command.CommandService;
 import de.ozgcloud.alfa.common.command.CommandTestFactory;
 import de.ozgcloud.alfa.common.command.CreateCommand;
+import de.ozgcloud.alfa.common.errorhandling.ExceptionController;
+import de.ozgcloud.alfa.common.errorhandling.ProblemDetailMapper;
 import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
-import de.ozgcloud.common.errorhandling.TechnicalException;
 import lombok.SneakyThrows;
 
 class ForwardByVorgangCommandControllerTest {
@@ -61,6 +62,8 @@ class ForwardByVorgangCommandControllerTest {
 	private CommandService commandService;
 	@Mock
 	private OrganisationsEinheitController organisationsEinheitController;
+	@Mock
+	private ProblemDetailMapper problemDetailMapper;
 	@Spy
 	@InjectMocks
 	private ForwardByVorgangCommandController controller;
@@ -69,7 +72,7 @@ class ForwardByVorgangCommandControllerTest {
 
 	@BeforeEach
 	void init() {
-		mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
+		mockMvc = MockMvcBuilders.standaloneSetup(controller).setControllerAdvice(new ExceptionController(problemDetailMapper)).build();
 	}
 
 	@Nested
@@ -125,25 +128,22 @@ class ForwardByVorgangCommandControllerTest {
 
 			@SneakyThrows
 			@Test
-			void shouldThrowExceptionIfNotFound() {
-				when(organisationsEinheitController.getById(OrganisationsEinheitTestFactory.ID))
-						.thenReturn(new ResponseEntity<>(HttpStatus.NOT_FOUND));
+			void shouldReturnInternalServerErrorIfNotFound() {
+				when(organisationsEinheitController.getById(any())).thenReturn(new ResponseEntity<>(HttpStatus.NOT_FOUND));
+
+				var response = doRequest();
 
-				assertTechnicalExceptionThrown();
+				response.andExpect(status().isInternalServerError());
 			}
 
 			@SneakyThrows
 			@Test
-			void shouldThrowExceptionIfBodyIsEmpty() {
-				when(organisationsEinheitController.getById(OrganisationsEinheitTestFactory.ID))
-						.thenReturn(new ResponseEntity<>(null, HttpStatus.OK));
+			void shouldReturnInternalServerErrorIfBodyIsEmpty() {
+				when(organisationsEinheitController.getById(any())).thenReturn(new ResponseEntity<>(null, HttpStatus.OK));
 
-				assertTechnicalExceptionThrown();
-			}
+				var response = doRequest();
 
-			private void assertTechnicalExceptionThrown() {
-				assertThatThrownBy(() -> doRequest()).rootCause().isInstanceOf(TechnicalException.class)
-						.hasMessageStartingWith("Could not get Organisationseinheit by id: %s", OrganisationsEinheitTestFactory.ID);
+				response.andExpect(status().isInternalServerError());
 			}
 		}