diff --git a/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java b/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java
index 646c79fb9f0b32521a4013e9739e2cdb19bcd297..2682f857154c70639645a99193026ef439fefed3 100644
--- a/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java
+++ b/src/test/java/de/ozgcloud/xta/client/XtaClientITCase.java
@@ -43,7 +43,7 @@ class XtaClientITCase {
 
 			@DisplayName("should return zero pending messages")
 			@ParameterizedTest
-			@ValueSource(strings = { CLIENT_IDENTIFIER1, CLIENT_IDENTIFIER2})
+			@ValueSource(strings = { CLIENT_IDENTIFIER1, CLIENT_IDENTIFIER2 })
 			@SneakyThrows
 			void shouldReturnZeroPendingMessages(String clientIdentifiers) {
 				var result = client.getMessagesMetadata(clientIdentifiers);
@@ -68,6 +68,7 @@ class XtaClientITCase {
 				var result = client.getMessagesMetadata(CLIENT_IDENTIFIER2);
 
 				assertThat(result.pendingMessageCount()).isOne();
+
 			}
 
 			@DisplayName("should return no pending message for client1")
@@ -82,7 +83,5 @@ class XtaClientITCase {
 
 	}
 
-
-
 }
 
diff --git a/src/test/java/de/ozgcloud/xta/client/XtaDevServerSetupExtension.java b/src/test/java/de/ozgcloud/xta/client/XtaDevServerSetupExtension.java
index 5d5244154e5006db5fa948234caf0578b93e22a6..6eeca9bb83b1d3741e95a154df8165321b77a716 100644
--- a/src/test/java/de/ozgcloud/xta/client/XtaDevServerSetupExtension.java
+++ b/src/test/java/de/ozgcloud/xta/client/XtaDevServerSetupExtension.java
@@ -16,12 +16,15 @@ import de.ozgcloud.xta.client.model.Identifier;
 import de.ozgcloud.xta.client.model.XtaMessageMetaData;
 import de.ozgcloud.xta.client.model.XtaMessageMetaDataTestFactory;
 import de.ozgcloud.xta.client.model.XtaMessageTestFactory;
+import genv3.de.xoev.transport.xta.x211.ParameterIsNotValidException;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 
 @Getter
 @Setter
+@Slf4j
 public class XtaDevServerSetupExtension implements BeforeAllCallback, BeforeEachCallback {
 
 	private XtaClient client;
@@ -81,15 +84,19 @@ public class XtaDevServerSetupExtension implements BeforeAllCallback, BeforeEach
 	@SneakyThrows
 	void sendTestMessageToClient2(Identifier author, Identifier reader) {
 		var messageId = service.createMessageId(author);
-
-		service.sendMessage(XtaMessageTestFactory.createBuilder()
-				.metaData(XtaMessageMetaDataTestFactory.createBuilder()
-						.authorIdentifier(author)
-						.readerIdentifier(reader)
-						.messageId(messageId)
-						.build())
-				.build()
-		);
+		try {
+			service.sendMessage(XtaMessageTestFactory.createBuilder()
+					.metaData(XtaMessageMetaDataTestFactory.createBuilder()
+							.authorIdentifier(author)
+							.readerIdentifier(reader)
+							.messageId(messageId)
+							.build())
+					.build()
+			);
+		} catch (ParameterIsNotValidException e) {
+			log.error("Failed to send test message to client2: {}", e.getFaultInfo().getErrorCode().getName());
+			throw e;
+		}
 	}
 
 	@SneakyThrows
@@ -103,7 +110,6 @@ public class XtaDevServerSetupExtension implements BeforeAllCallback, BeforeEach
 		}
 	}
 
-
 	@SneakyThrows
 	private static byte[] readBytesFromFile(String path) {
 		return Files.toByteArray(new File(path));
@@ -117,5 +123,4 @@ public class XtaDevServerSetupExtension implements BeforeAllCallback, BeforeEach
 		return client.deriveIdentifier(CLIENT_IDENTIFIER2);
 	}
 
-
 }