diff --git a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
index 4f60ad195..29ccacdc5 100644
--- a/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
+++ b/java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
@@ -69,8 +69,11 @@ private static void getPoolInstance() {
 					.register("http", PlainConnectionSocketFactory.INSTANCE).register("https", getSSLSecureInstance())
 					.build();
 			connManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
-			connManager.setMaxTotal((int) CommonUtil.val(clientCfg.getProperty("Client","HTTPCLIENT_MAX_SIZE","1000")));
-			connManager.setDefaultMaxPerRoute((int) CommonUtil.val(clientCfg.getProperty("Client","HTTPCLIENT_MAX_PER_ROUTE","1000")));
+			connManager.setMaxTotal((int) CommonUtil.val(clientCfg.getProperty("Client", "HTTPCLIENT_MAX_SIZE", "1000")));
+			connManager.setDefaultMaxPerRoute((int) CommonUtil.val(clientCfg.getProperty("Client", "HTTPCLIENT_MAX_PER_ROUTE", "1000")));
+		}
+		else {
+			connManager.closeExpiredConnections();
 		}
 	}
 
@@ -277,7 +280,13 @@ private void SetCookieAtr(CookieStore cookiesToSend) {
 						for (Header header : headers) {
 							String[] cookieParts = header.getValue().split(";");
 							String[] cookieKeyAndValue = cookieParts[0].split("=");
-							webcontextCookieHeader += cookieKeyAndValue[0] + "=" + cookieKeyAndValue[1] + "; ";
+							webcontextCookieHeader += cookieKeyAndValue[0];
+							if (cookieKeyAndValue.length > 1) {
+								webcontextCookieHeader += "=" + cookieKeyAndValue[1] + "; ";
+							}
+							else {
+								webcontextCookieHeader += "; ";
+							}
 						}
 						webcontextCookieHeader = webcontextCookieHeader.trim().substring(0,webcontextCookieHeader.length()-2);	// Se quita el espacio y la coma al final
 						webcontext.setCookie(SET_COOKIE,webcontextCookieHeader,"",CommonUtil.nullDate(),"",this.getSecure());