diff --git a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-backend/src/main/java/org/kie/workbench/common/screens/projecteditor/backend/server/ProjectScreenServiceImpl.java b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-backend/src/main/java/org/kie/workbench/common/screens/projecteditor/backend/server/ProjectScreenServiceImpl.java
index 44764aca444..a016ffed43f 100644
--- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-backend/src/main/java/org/kie/workbench/common/screens/projecteditor/backend/server/ProjectScreenServiceImpl.java
+++ b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-backend/src/main/java/org/kie/workbench/common/screens/projecteditor/backend/server/ProjectScreenServiceImpl.java
@@ -4,8 +4,6 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.apache.commons.lang.StringUtils;
-import org.guvnor.common.services.project.backend.server.utils.IdentifierUtils;
 import org.guvnor.common.services.project.model.POM;
 import org.guvnor.common.services.project.model.Project;
 import org.guvnor.common.services.project.service.KModuleService;
@@ -77,21 +75,25 @@ public void save( final Path pathToPomXML,
                       final String comment ) {
         final Project project = projectService.resolveProject( pathToPomXML );
 
-        ioService.startBatch();
-        pomService.save( pathToPomXML,
-                         model.getPOM(),
-                         model.getPOMMetaData(),
-                         comment );
-        kModuleService.save( project.getKModuleXMLPath(),
-                             model.getKModule(),
-                             model.getKModuleMetaData(),
+        try {
+            ioService.startBatch();
+            pomService.save( pathToPomXML,
+                             model.getPOM(),
+                             model.getPOMMetaData(),
                              comment );
-        projectService.save( project.getImportsPath(),
-                             model.getProjectImports(),
-                             model.getProjectImportsMetaData(),
-                             comment );
-        ioService.endBatch();
-
+            kModuleService.save( project.getKModuleXMLPath(),
+                                 model.getKModule(),
+                                 model.getKModuleMetaData(),
+                                 comment );
+            projectService.save( project.getImportsPath(),
+                                 model.getProjectImports(),
+                                 model.getProjectImportsMetaData(),
+                                 comment );
+        } catch ( final Exception e ) {
+            throw new RuntimeException( e );
+        } finally {
+            ioService.endBatch();
+        }
     }
 
     @Override
diff --git a/kie-wb-common-screens/kie-wb-common-project-explorer/kie-wb-common-project-explorer-backend/src/main/java/org/kie/workbench/common/screens/explorer/backend/server/ExplorerServiceImpl.java b/kie-wb-common-screens/kie-wb-common-project-explorer/kie-wb-common-project-explorer-backend/src/main/java/org/kie/workbench/common/screens/explorer/backend/server/ExplorerServiceImpl.java
index cba262217ca..bd6e8846265 100644
--- a/kie-wb-common-screens/kie-wb-common-project-explorer/kie-wb-common-project-explorer-backend/src/main/java/org/kie/workbench/common/screens/explorer/backend/server/ExplorerServiceImpl.java
+++ b/kie-wb-common-screens/kie-wb-common-project-explorer/kie-wb-common-project-explorer-backend/src/main/java/org/kie/workbench/common/screens/explorer/backend/server/ExplorerServiceImpl.java
@@ -745,13 +745,12 @@ public void deleteItem( final FolderItem folderItem,
                                                                comment ),
                                           StandardDeleteOption.NON_EMPTY_DIRECTORIES );
             }
-
+        } catch ( final Exception e ) {
+            throw ExceptionUtilities.handleException( e );
+        } finally {
             if ( paths.size() > 1 ) {
                 ioService.endBatch();
             }
-
-        } catch ( final Exception e ) {
-            throw ExceptionUtilities.handleException( e );
         }
     }
 
@@ -797,11 +796,10 @@ public void renameItem( final FolderItem folderItem,
                     }
                 }
             }
-
-            ioService.endBatch();
-
         } catch ( final Exception e ) {
             throw ExceptionUtilities.handleException( e );
+        } finally {
+            ioService.endBatch();
         }
     }
 
@@ -847,11 +845,10 @@ public void copyItem( final FolderItem folderItem,
                     }
                 }
             }
-
-            ioService.endBatch();
-
         } catch ( final Exception e ) {
             throw ExceptionUtilities.handleException( e );
+        } finally {
+            ioService.endBatch();
         }
     }