diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java
index b8d32979b2..cd598d10d6 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java
@@ -129,13 +129,10 @@ public class RmActionPost extends DeclarativeWebScript
                Object nextValue = paramsObj.get(nextKeyString);
 
                // Check for date values
-               if (nextValue instanceof JSONObject)
+               if ((nextValue instanceof JSONObject) && ((JSONObject)nextValue).has("iso8601"))
                {
-                  if (((JSONObject)nextValue).has("iso8601"))
-                  {
-                     String dateStringValue = ((JSONObject)nextValue).getString("iso8601");
-                     nextValue = ISO8601DateFormat.parse(dateStringValue);
-                  }
+                   String dateStringValue = ((JSONObject)nextValue).getString("iso8601");
+                   nextValue = ISO8601DateFormat.parse(dateStringValue);
                }
 
                actionParams.put(nextKeyString, (Serializable)nextValue);