1 files changed, 4 insertions, 3 deletions
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/WrapperEncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
index f71bee1ec..86b0861cb 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
@@ -105,10 +105,11 @@ public class WrapperEncryptionTool {
             log.debug("Caught Exception", e);
             log.info("Caught exception", e);
             log.info("APPC-MESSAGE:" + e.getMessage());
-            dbResourceManager.cleanUp();
-
         } finally {
-            dbResourceManager.cleanUp();
+            //When dbResourceManager is not created then no need to cleanup
+            if (dbResourceManager != null) {
+                dbResourceManager.cleanUp();
+            }
         }
     }