1 files changed, 8 insertions, 2 deletions
diff --git a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/MergerConfigurationFactory.java b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/MergerConfigurationFactory.java
index eea0551d..fa0b8cde 100644
--- a/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/MergerConfigurationFactory.java
+++ b/trustStoreMerger/src/main/java/org/onap/oom/truststoremerger/configuration/MergerConfigurationFactory.java
@@ -22,6 +22,9 @@ package org.onap.oom.truststoremerger.configuration;
 import org.onap.oom.truststoremerger.certification.file.TruststoresPathsProvider;
 import org.onap.oom.truststoremerger.certification.file.TruststoresPathsProviderException;
 
+import static org.onap.oom.truststoremerger.api.ConfigurationEnvs.TRUSTSTORES_ENV;
+import static org.onap.oom.truststoremerger.api.ConfigurationEnvs.TRUSTSTORES_PASSWORDS_ENV;
+
 import java.util.List;
 
 public class MergerConfigurationFactory {
@@ -32,12 +35,15 @@ public class MergerConfigurationFactory {
         this.pathsProvider = pathsProvider;
     }
 
-    public MergerConfiguration createConfiguration() throws MergerConfigurationException, TruststoresPathsProviderException {
+    public MergerConfiguration createConfiguration()
+        throws MergerConfigurationException, TruststoresPathsProviderException {
         List<String> truststores = pathsProvider.getTruststores();
         List<String> truststoresPasswords = pathsProvider.getTruststoresPasswords();
 
         if (truststores.size() != truststoresPasswords.size()) {
-            throw new MergerConfigurationException("Size of TRUSTSTORES does not match size of TRUSTSTORES_PASSWORDS environment variables");
+            throw new MergerConfigurationException(
+                "Size of " + TRUSTSTORES_ENV
+                    + " does not match size of " + TRUSTSTORES_PASSWORDS_ENV + " environment variables");
         }
 
         return new MergerConfiguration(truststores, truststoresPasswords);