diff --git a/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformManagerImpl.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformManagerImpl.java
index 23e50e83..b7ffa878 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformManagerImpl.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformManagerImpl.java
@@ -225,21 +225,7 @@ public class TransformManagerImpl implements TransformManager
         {
             logger.error("Failed to delete temporary source file {}", sourceFile.getPath());
         }
-        deleteDocUUIDFolder();
-        outputStreamLengthRecorder = null;
-        sourceFile = null;
-        sourceFileName = null;
-        createSourceFileCalled = false;
-        startedWithSourceFile = null;
-    }
-
-    public void deleteDocUUIDFolder()
-    {
-        if (sourceFile == null)
-        {
-            return;
-        }
-        if (Util.isDocFile(sourceFile.getPath()))
+        if (sourceFile != null && Util.isDocFile(sourceFile.getPath()))
         {
             File parentDir = sourceFile.getParentFile();
             if (parentDir != null
@@ -249,6 +235,11 @@ public class TransformManagerImpl implements TransformManager
                 logger.error("Failed to delete parent directory {}", parentDir.getPath());
             }
         }
+        outputStreamLengthRecorder = null;
+        sourceFile = null;
+        sourceFileName = null;
+        createSourceFileCalled = false;
+        startedWithSourceFile = null;
     }
 
     public void deleteTargetFile()