diff --git a/data-upgrade-move-folders/src/main/java/org/exoplatform/jcr/upgrade/MoveNodesUpgradePlugin.java b/data-upgrade-move-folders/src/main/java/org/exoplatform/jcr/upgrade/MoveNodesUpgradePlugin.java
index 71d7768d9..088bb66df 100644
--- a/data-upgrade-move-folders/src/main/java/org/exoplatform/jcr/upgrade/MoveNodesUpgradePlugin.java
+++ b/data-upgrade-move-folders/src/main/java/org/exoplatform/jcr/upgrade/MoveNodesUpgradePlugin.java
@@ -111,10 +111,14 @@ public void processUpgrade(String oldVersion, String newVersion) {
         for (Space space : spaceArray) {
           String originFolderPath = "/Groups" + space.getGroupId() + originPath;
           String destinationFolderPath = "/Groups" + space.getGroupId() + destinationPath;
-          Item originFolderNode = session.getItem(originFolderPath);
-          if(originFolderNode != null) {
-            session.move(originFolderPath, destinationFolderPath);
-            movedFoldersCount ++;
+          try {
+            Item originFolderNode = session.getItem(originFolderPath);
+            if (originFolderNode != null) {
+              session.move(originFolderPath, destinationFolderPath);
+              movedFoldersCount++;
+            }
+          } catch(RepositoryException e) {
+            log.warn("Folder {} to move was not found, ignoring it", originFolderPath, e);
           }
           // remove unnecessary folders if defined in init params
           if(!foldersToRemove.isEmpty()) {
diff --git a/data-upgrade-packaging/pom.xml b/data-upgrade-packaging/pom.xml
index 73978cce7..fd47e02a0 100644
--- a/data-upgrade-packaging/pom.xml
+++ b/data-upgrade-packaging/pom.xml
@@ -80,6 +80,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>data-upgrade-es-reindex</artifactId>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>data-upgrade-move-folders</artifactId>
+    </dependency>
 
     <!-- Transitive dependencies provided by eXo : set to provided -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index c704392ad..739d93dc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,8 +32,8 @@
     <module>data-upgrade-notifications</module>
     <module>data-upgrade-processes-permissions</module>
     <module>data-upgrade-es-reindex</module>
-    <module>data-upgrade-packaging</module>
     <module>data-upgrade-move-folders</module>
+    <module>data-upgrade-packaging</module>
   </modules>
   <properties>
     <!-- 3rd party libraries versions -->
@@ -133,6 +133,11 @@
         <artifactId>data-upgrade-es-reindex</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>data-upgrade-move-folders</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>data-upgrade-packaging</artifactId>