diff --git a/user_channel/passwd_mgr.cpp b/user_channel/passwd_mgr.cpp
index 939f48f..c5323fe 100644
--- a/user_channel/passwd_mgr.cpp
+++ b/user_channel/passwd_mgr.cpp
@@ -175,7 +175,6 @@
 
     std::unique_ptr<EVP_CIPHER_CTX, decltype(&::EVP_CIPHER_CTX_free)> ctx(
         EVP_CIPHER_CTX_new(), ::EVP_CIPHER_CTX_free);
-    EVP_CIPHER_CTX_set_padding(ctx.get(), 1);
 
     if (!ctx)
     {
@@ -183,6 +182,8 @@
         return -ENOMEM;
     }
 
+    EVP_CIPHER_CTX_set_padding(ctx.get(), 1);
+
     // Set key & IV
     int retval = EVP_CipherInit_ex(ctx.get(), cipher, NULL, key, iv,
                                    static_cast<int>(doEncrypt));