diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser.java
index ee0dcde916..ac796e2f39 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser.java
@@ -34,6 +34,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Random;
 
+import org.alfresco.error.AlfrescoRuntimeException;
+
 /**
  * Content cleanser base implementation.
  * 
@@ -41,22 +43,22 @@ import java.util.Random;
  * @since 2.4.a
  */
 public abstract class ContentCleanser
-{    
+{
     /**
      * Cleanse file
      * 
      * @param file  file to cleanse
      */
     public abstract void cleanse(File file);
-    
+
     /**
      * Overwrite files bytes with provided overwrite operation
      * 
-     * @param file                  file 
+     * @param file                  file
      * @param overwriteOperation    overwrite operation
      */
     protected void overwrite(File file, OverwriteOperation overwriteOperation)
-    {   
+    {
         // get the number of bytes
         long bytes = file.length();
         try
@@ -74,18 +76,18 @@ public abstract class ContentCleanser
         catch (IOException ioException)
         {
             // re-throw
-            throw new RuntimeException("Unable to overwrite file", ioException);
+            throw new AlfrescoRuntimeException("Unable to overwrite file", ioException);
         }
     }
-    
+
     /**
-     * Overwrite operation 
+     * Overwrite operation
      */
     protected abstract class OverwriteOperation
     {
         public abstract void operation(OutputStream os) throws IOException;
     }
-    
+
     /**
      * Overwrite with zeros operation
      */
@@ -96,7 +98,7 @@ public abstract class ContentCleanser
             os.write(0);
         }
     };
-    
+
     /**
      * Overwrite with ones operation
      */
@@ -107,14 +109,14 @@ public abstract class ContentCleanser
             os.write(0xff);
         }
     };
-    
+
     /**
      * Overwrite with random operation
      */
     protected OverwriteOperation overwriteRandom = new OverwriteOperation()
     {
         private Random random = new Random();
-        
+
         public void operation(OutputStream os) throws IOException
         {
             byte[] randomByte = new byte[1];
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
index 2ef29b6b93..c3189e78ef 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
@@ -291,7 +291,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
         }
         catch (Exception ex)
         {
-            throw new RuntimeException("Unexpected exception thrown. Please refer to the log files for details.", ex);
+            throw new AlfrescoRuntimeException("Unexpected exception thrown. Please refer to the log files for details.", ex);
         }
         finally
         {
@@ -304,7 +304,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
                 }
                 catch (IOException ex)
                 {
-                    throw new RuntimeException("Failed to close the input stream!", ex);
+                    throw new AlfrescoRuntimeException("Failed to close the input stream!", ex);
                 }
             }
         }