diff --git a/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java b/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java
index b51cb0007e2c641cbb1be57e9f9d0cf8c001a865..9b49c0716c7e17dd5a4b40a44e53f7b0c33f6110 100644
--- a/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java
+++ b/src/main/java/de/ozgcloud/xta/client/config/XtaClientConfig.java
@@ -136,7 +136,7 @@ public class XtaClientConfig {
 	@RequiredArgsConstructor
 	@Getter
 	@Builder
-	@ToString
+	@ToString(exclude = {"content", "password"})
 	public static class KeyStore {
 		/**
 		 * File content of the keystore file.
diff --git a/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java b/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java
index 536ff5a79e11add496555a0511f20be714a2156c..254a3f6ff3cb416ed035ad23970da8e3426f38d5 100644
--- a/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java
+++ b/src/main/java/de/ozgcloud/xta/client/core/XtaClientService.java
@@ -55,7 +55,7 @@ public class XtaClientService {
 		try {
 			return Optional.of(service.getMessage(messageId, readerClientIdentifier));
 		} catch (XTAWSTechnicalProblemException | PermissionDeniedException | InvalidMessageIDException | RuntimeException e) {
-			logError("Failed to get message by id ! '%s' (reader: %s)".formatted(messageId, readerClientIdentifier.value()), e);
+			logError("Failed to get message by id! '%s' (reader: %s)".formatted(messageId, readerClientIdentifier.value()), e);
 			return Optional.empty();
 		}
 	}