diff --git a/client/src/main/java/io/a2a/client/A2ACardResolver.java b/client/src/main/java/io/a2a/client/A2ACardResolver.java
index 88d1e351f..ef23c1d60 100644
--- a/client/src/main/java/io/a2a/client/A2ACardResolver.java
+++ b/client/src/main/java/io/a2a/client/A2ACardResolver.java
@@ -55,7 +55,13 @@ public A2ACardResolver(A2AHttpClient httpClient, String baseUrl, String agentCar
     public A2ACardResolver(A2AHttpClient httpClient, String baseUrl, String agentCardPath,
                            Map<String, String> authHeaders) throws A2AClientError {
         this.httpClient = httpClient;
+        if (!baseUrl.endsWith("/")) {
+            baseUrl += "/";
+        }
         agentCardPath = agentCardPath == null || agentCardPath.isEmpty() ? DEFAULT_AGENT_CARD_PATH : agentCardPath;
+        if (agentCardPath.startsWith("/")) {
+            agentCardPath = agentCardPath.substring(1);
+        }
         try {
             this.url = new URI(baseUrl).resolve(agentCardPath).toString();
         } catch (URISyntaxException e) {