diff --git a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticClientHandlerAws.java b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticClientHandlerAws.java
index bb0407cdb5a44aa83c765da48708a2a29532c784..52943cebc267e8c03ffd6ab68e89948d28027c09 100644
--- a/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticClientHandlerAws.java
+++ b/provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticClientHandlerAws.java
@@ -71,11 +71,9 @@ public class ElasticClientHandlerAws extends ElasticClientHandler {
                 httpClientBuilder.setSSLContext(sslContext)
                                 .setSSLHostnameVerifier((s, session) -> true));
             } catch (NoSuchAlgorithmException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+                log.severe(e.getMessage());
             } catch (KeyManagementException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+                log.severe(e.getMessage());
             }
 
         }
diff --git a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/util/ElasticUtilsAws.java b/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/util/ElasticUtilsAws.java
index e464354dbebd4d35cca9e916cd5a5fa0845dae68..30533f8325912b4c87e20d2c4377f1d9596df40d 100644
--- a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/util/ElasticUtilsAws.java
+++ b/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/util/ElasticUtilsAws.java
@@ -21,12 +21,14 @@ import java.util.Base64;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
 import org.apache.http.message.BasicHeader;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
 
+@Slf4j
 public class ElasticUtilsAws extends ElasticUtils {
 
     private static final int REST_CLIENT_CONNECT_TIMEOUT = 60000;
@@ -50,11 +52,9 @@ public class ElasticUtilsAws extends ElasticUtils {
             httpClientBuilder.setSSLContext(sslContext)
                             .setSSLHostnameVerifier((s, session) -> true));
         } catch (NoSuchAlgorithmException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            log.error("No such algorithm.", e);
         } catch (KeyManagementException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            log.error("Key management error.", e);
         }