diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentBase.java
index d8bbf8b89f..ebb0b1452e 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentBase.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentBase.java
@@ -199,7 +199,8 @@ public abstract class ClassifyContentBase extends AbstractRmWebScript
     {
         Date parsedDate = null;
 
-        if (isNotBlank(date))
+        // FIXME: "null" check
+        if (isNotBlank(date) && !date.equalsIgnoreCase("null"))
         {
             try
             {