diff --git a/gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java b/gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java
index 1417edbb4..830e92e11 100644
--- a/gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java
+++ b/gxcloudstorage-awss3-v1/src/main/java/com/genexus/db/driver/ExternalProviderS3V1.java
@@ -29,7 +29,6 @@
 import java.util.Date;
 import java.util.List;
 
-
 public class ExternalProviderS3V1 extends ExternalProviderBase implements ExternalProvider  {
 	private static Logger logger = LogManager.getLogger(ExternalProviderS3V1.class);
 
@@ -173,21 +172,31 @@ private String ensureFolder(String... pathPart) {
 	}
 
 	public void download(String externalFileName, String localFile, ResourceAccessControlList acl) {
+		S3ObjectInputStream objectData = null;
 		try {
 			S3Object object = client.getObject(new GetObjectRequest(bucket, externalFileName));
-			try (InputStream objectData = object.getObjectContent()) {
-				try (OutputStream outputStream = new FileOutputStream(new File(localFile))){
-					int read;
-					byte[] bytes = new byte[1024];
-					while ((read = objectData.read(bytes)) != -1) {
-						outputStream.write(bytes, 0, read);
-					}
+			objectData = object.getObjectContent();
+			File file = new File(localFile);
+			File parentDir = file.getParentFile();
+			if (parentDir != null && !parentDir.exists())
+				parentDir.mkdirs();
+
+			try (OutputStream outputStream = new FileOutputStream(file)) {
+				int read;
+				byte[] bytes = new byte[1024];
+				while ((read = objectData.read(bytes)) != -1) {
+					outputStream.write(bytes, 0, read);
 				}
 			}
 		} catch (FileNotFoundException ex) {
 			logger.error("Error while downloading file to the external provider", ex);
 		} catch (IOException ex) {
 			logger.error("Error while downloading file to the external provider", ex);
+		} finally {
+			try {
+				if (objectData != null)
+					objectData.close();
+			} catch (IOException ioe) {logger.error("Error while draining the S3ObjectInputStream", ioe);}
 		}
 	}