diff --git a/src/core/deployment/dep_engine.c b/src/core/deployment/dep_engine.c
index 2ccbb83..6b03bb8 100644
--- a/src/core/deployment/dep_engine.c
+++ b/src/core/deployment/dep_engine.c
@@ -563,6 +563,7 @@
     if(dep_engine->repos_listener)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
     }
 
     if(dep_engine->module_dir)
@@ -777,6 +778,7 @@
     if(dep_engine->repos_listener)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
     }
 
     dep_engine->repos_listener = axis2_repos_listener_create_with_folder_name_and_dep_engine(env,
@@ -798,6 +800,7 @@
     if(AXIS2_SUCCESS != status)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
         axis2_conf_free(dep_engine->conf, env);
         dep_engine->conf = NULL;
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED, AXIS2_FAILURE);
@@ -809,6 +812,7 @@
     if(AXIS2_SUCCESS != status)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
         axis2_conf_free(dep_engine->conf, env);
         dep_engine->conf = NULL;
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -825,6 +829,7 @@
     if(AXIS2_SUCCESS != status)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
         axis2_conf_free(dep_engine->conf, env);
         dep_engine->conf = NULL;
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -964,6 +969,7 @@
         if(dep_engine->repos_listener)
         {
             axis2_repos_listener_free(dep_engine->repos_listener, env);
+            dep_engine->repos_listener = NULL;
         }
 
         dep_engine->repos_listener = axis2_repos_listener_create_with_folder_name_and_dep_engine(
@@ -979,6 +985,7 @@
     if(AXIS2_SUCCESS != status)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
         /* Set the dep_engine to NULL before freeing conf in order to
               avoid deleting it twice*/
         axis2_conf_set_dep_engine(dep_engine->conf,env,NULL);