diff --git a/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java b/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
index 6bd9ec46dcccb7e8a5ffd822f5de4d7a423746ef..8601abbea6525fb5e0775011c9061360510e4138 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
@@ -30,6 +30,8 @@ import org.springframework.stereotype.Component;
 
 import lombok.extern.log4j.Log4j2;
 
+import de.ozgcloud.xta.client.exception.XtaClientException;
+
 @Log4j2
 @Component
 class XtaRunner implements ApplicationListener<ContextRefreshedEvent> {
@@ -46,7 +48,7 @@ class XtaRunner implements ApplicationListener<ContextRefreshedEvent> {
 	void runGetXtaMessages() {
 		try {
 			service.fetchMessages();
-		} catch (RuntimeException e) {
+		} catch (XtaClientException | RuntimeException e) {
 			LOG.error("Error fetch XTA Message List.", e);
 		}
 	}
diff --git a/src/main/java/de/ozgcloud/eingang/xta/XtaService.java b/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
index e1308d3934da198b27f8089ce612db5fb485f0c8..d3cf1e2bae722d2874176223b62054f2132e0fee 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
@@ -30,7 +30,6 @@ import java.util.Optional;
 import java.util.function.Consumer;
 
 import lombok.NonNull;
-import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -46,6 +45,7 @@ import de.ozgcloud.eingang.common.vorgang.VorgangNummerSupplier;
 import de.ozgcloud.eingang.semantik.SemantikAdapter;
 import de.ozgcloud.eingang.xdomea.XdomeaMessageDataMapper;
 import de.ozgcloud.xta.client.XtaClient;
+import de.ozgcloud.xta.client.exception.XtaClientException;
 import de.ozgcloud.xta.client.model.XtaFile;
 import de.ozgcloud.xta.client.model.XtaMessage;
 import de.ozgcloud.xta.client.model.XtaMessageMetaData;
@@ -60,7 +60,7 @@ class XtaService {
 
 	static final String FIM_MESSAGE_TYPE_PREFIX = "fim.";
 
-	final Consumer<XtaMessage> MESSAGE_PROCESSOR = this::processMessage;
+	final Consumer<XtaMessage> messageProcessor = this::processMessage;
 
 	@Autowired
 	private XtaClient xtaClient;
@@ -77,10 +77,9 @@ class XtaService {
 	private XtaIncomingFilesMapper xtaIncomingFilesMapper;
 
 
-	@SneakyThrows
-	public void fetchMessages() {
+	public void fetchMessages() throws XtaClientException {
 
-		var transportReports = xtaClient.fetchMessages(MESSAGE_PROCESSOR);
+		var transportReports = xtaClient.fetchMessages(messageProcessor);
 		logTransportReports(transportReports);
 	}
 
diff --git a/src/test/java/de/ozgcloud/eingang/xta/XtaRunnerTest.java b/src/test/java/de/ozgcloud/eingang/xta/XtaRunnerTest.java
index e5d2d31ced5d493b08af6bfc464ec987f573ae7b..2a5fb722e52f8ef03c00e6d43c68dc59c5fba095 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/XtaRunnerTest.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/XtaRunnerTest.java
@@ -25,6 +25,7 @@ package de.ozgcloud.eingang.xta;
 
 import static org.mockito.Mockito.*;
 
+import lombok.SneakyThrows;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -42,6 +43,7 @@ class XtaRunnerTest {
 	class TestRunGetXtaMessages {
 
 		@Test
+		@SneakyThrows
 		void shouldCallXtaServiceFetchMessages() {
 			scheduler.runGetXtaMessages();
 
diff --git a/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java b/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java
index 7690d8be39eed9638b292df932802d1cabccab9d..12b47247bcd7c0ec9fbd38cc6e3c2f5c041fc2c5 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java
@@ -97,10 +97,11 @@ class XtaServiceTest {
 		void shouldUseMessageProcessor() {
 			service.fetchMessages();
 
-			verify(xtaClient).fetchMessages(service.MESSAGE_PROCESSOR);
+			verify(xtaClient).fetchMessages(service.messageProcessor);
 		}
 
 		@Test
+		@SneakyThrows
 		void shouldCallLogTransportReports() {
 			service.fetchMessages();