diff --git a/gxweb/src/main/java/com/genexus/usercontrols/UserControlGenerator.java b/gxweb/src/main/java/com/genexus/usercontrols/UserControlGenerator.java
index 56eee99d1..eb56dc505 100644
--- a/gxweb/src/main/java/com/genexus/usercontrols/UserControlGenerator.java
+++ b/gxweb/src/main/java/com/genexus/usercontrols/UserControlGenerator.java
@@ -31,28 +31,14 @@ public String render(String internalName, GXMap propbag)
 		if (getTemplateDateTime() > lastRenderTime)
 		{
 			MustacheFactory mf = new DefaultMustacheFactory();
-			Reader reader = null;
-			try
+			try (Reader reader = new InputStreamReader(new FileInputStream(getTemplateFile(this.controlType)), "utf-8");)
 			{
-				reader = new InputStreamReader(new FileInputStream(getTemplateFile(this.controlType)), "utf-8");
 				mustache = mf.compile(reader, getTemplateFile(this.controlType));
 			}
 			catch (Exception e)
 			{
 				mustache = mf.compile(getTemplateFile(this.controlType));
 			}
-			finally
-			{
-				try
-				{
-					reader.close();
-				}
-				catch (IOException e)
-				{
-					logger.error("Failed to render UserControl ", e);
-					return "";
-				}
-			}
 			lastRenderTime = new Date().getTime();
 		}
 		
diff --git a/java/src/main/java/com/genexus/specific/java/HttpClient.java b/java/src/main/java/com/genexus/specific/java/HttpClient.java
index 87b96e4c4..2a1a0cacd 100644
--- a/java/src/main/java/com/genexus/specific/java/HttpClient.java
+++ b/java/src/main/java/com/genexus/specific/java/HttpClient.java
@@ -60,10 +60,7 @@ public com.genexus.internet.IHttpClient initHttpClientImpl() {
 
 			client = useHttpClientOldImplementation();
 
-		} finally {
-
-			return client;
-
 		}
+		return client;
 	}
 }