diff --git a/access-token-provider-api/src/main/java/net/ihe/gazelle/app/accesstokenproviderapi/application/DummyAuthzServerSoapui.java b/access-token-provider-api/src/main/java/net/ihe/gazelle/app/accesstokenproviderapi/application/DummyAuthzServerSoapui.java
index dc4d502499269f4b51d20e637b0d4bd40a358db9..8a7909d4b1b3b1c2ba5e3b076ee0ee498d197453 100644
--- a/access-token-provider-api/src/main/java/net/ihe/gazelle/app/accesstokenproviderapi/application/DummyAuthzServerSoapui.java
+++ b/access-token-provider-api/src/main/java/net/ihe/gazelle/app/accesstokenproviderapi/application/DummyAuthzServerSoapui.java
@@ -4,6 +4,8 @@ import net.ihe.gazelle.app.accesstokenproviderapi.business.AccessTokenRequest;
 import net.ihe.gazelle.app.accesstokenproviderapi.business.SymmetricSignature;
 import net.ihe.gazelle.app.audienceretriever.adapter.AudienceSecretRetrieverForSoapui;
 import net.ihe.gazelle.app.audienceretriever.application.AudienceSecretRetriever;
+import net.ihe.gazelle.framework.loggerservice.application.GazelleLogger;
+import net.ihe.gazelle.framework.loggerservice.application.GazelleLoggerFactory;
 import net.ihe.gazelle.modelapi.sb.business.EncodingException;
 import net.ihe.gazelle.sb.iua.business.TokenType;
 
@@ -11,6 +13,8 @@ import java.time.Duration;
 
 public class DummyAuthzServerSoapui implements DummyAuthzServer {
 
+    private static final GazelleLogger LOGGER = GazelleLoggerFactory.getInstance().getLogger(DummyAuthzServerSoapui.class);
+
     private static final String ALGORITHM = "HS256";
     private static final String ISSUER = "https://ehealthsuisse.ihe-europe.net/access-token-provider";
     private static final TokenType TOKEN_TYPE = TokenType.JWT;
@@ -92,13 +96,10 @@ public class DummyAuthzServerSoapui implements DummyAuthzServer {
         byte[] token = null;
         try {
             token = tokenGenerator.generateAccessToken(getAccessTokenRequest(userId, audienceId)).getToken();
-        } catch (EncodingException e) {
-            e.printStackTrace();
-        } catch (TokenRequestException e) {
-            e.printStackTrace();
-        } finally {
-            return token;
+        } catch (EncodingException | TokenRequestException e) {
+            LOGGER.error("Error generating Access Token", e);
         }
+        return token;
     }
 
 
diff --git a/access-token-provider-api/src/main/java/net/ihe/gazelle/app/accesstokenproviderapi/application/TokenGenerator.java b/access-token-provider-api/src/main/java/net/ihe/gazelle/app/accesstokenproviderapi/application/TokenGenerator.java
index 6f150d4439b73745c2971769819fbcd828c0b658..1643776fba547e59da1ff38ebd0cb1c1e5a8df70 100644
--- a/access-token-provider-api/src/main/java/net/ihe/gazelle/app/accesstokenproviderapi/application/TokenGenerator.java
+++ b/access-token-provider-api/src/main/java/net/ihe/gazelle/app/accesstokenproviderapi/application/TokenGenerator.java
@@ -45,7 +45,7 @@ public class TokenGenerator {
             throw new TokenRequestException("Unsupported Algorithm");
         }
 
-        Duration duration = !accessTokenRequest.getValidityTime().equals(null) ? accessTokenRequest.getValidityTime() : DEFAULT_DURATION;
+        Duration duration = accessTokenRequest.getValidityTime() != null ? accessTokenRequest.getValidityTime() : DEFAULT_DURATION;
 
         if (accessTokenRequest.getTokenType() == null || !accessTokenRequest.getTokenType().equals(TOKEN_TYPE)) {
             throw new TokenRequestException("Unsupported token type");
diff --git a/audience-retriever/src/main/java/net/ihe/gazelle/app/audienceretriever/adapter/AudienceSecretRetrieverForSoapui.java b/audience-retriever/src/main/java/net/ihe/gazelle/app/audienceretriever/adapter/AudienceSecretRetrieverForSoapui.java
index a4cac1b1b27b9b24a56b84a09ee8482d004889f5..3570a14490cb3869f1ca08c0bd510fe49e5aa249 100644
--- a/audience-retriever/src/main/java/net/ihe/gazelle/app/audienceretriever/adapter/AudienceSecretRetrieverForSoapui.java
+++ b/audience-retriever/src/main/java/net/ihe/gazelle/app/audienceretriever/adapter/AudienceSecretRetrieverForSoapui.java
@@ -1,14 +1,17 @@
 package net.ihe.gazelle.app.audienceretriever.adapter;
 
 import net.ihe.gazelle.app.audienceretriever.application.AudienceSecretRetriever;
+import net.ihe.gazelle.framework.loggerservice.application.GazelleLogger;
+import net.ihe.gazelle.framework.loggerservice.application.GazelleLoggerFactory;
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Properties;
 
 public class AudienceSecretRetrieverForSoapui implements AudienceSecretRetriever {
 
+    private static final GazelleLogger LOGGER = GazelleLoggerFactory.getInstance().getLogger(AudienceSecretRetrieverForSoapui.class);
+
     private String propertiesFile = "/opt/simulators/audience.properties";
 
     public AudienceSecretRetrieverForSoapui() {
@@ -18,33 +21,20 @@ public class AudienceSecretRetrieverForSoapui implements AudienceSecretRetriever
         this.propertiesFile = propertiesFile;
     }
 
-    public static Properties readPropertiesFile(String fileName) throws IOException {
-        FileInputStream fis = null;
+    public static Properties readPropertiesFile(String fileName) {
         Properties prop = null;
-        try {
-            fis = new FileInputStream(fileName);
+        try (FileInputStream fis = new FileInputStream(fileName)) {
             prop = new Properties();
             prop.load(fis);
-        } catch(FileNotFoundException fnfe) {
-            fnfe.printStackTrace();
-        } catch(IOException ioe) {
-            ioe.printStackTrace();
-        } finally {
-            fis.close();
+        } catch (IOException e) {
+            LOGGER.error("Error reading properties file !", e);
         }
         return prop;
     }
 
     @Override
     public String retrieveSecretForAudience(String audience) {
-        String secret = null;
-        try {
-            Properties prop = readPropertiesFile(propertiesFile);
-            secret = prop.getProperty(audience);
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            return secret;
-        }
+        Properties prop = readPropertiesFile(propertiesFile);
+        return prop.getProperty(audience);
     }
 }