diff --git a/source/java/org/alfresco/service/cmr/repository/Period.java b/source/java/org/alfresco/service/cmr/repository/Period.java
index 2614483406..116616f08e 100644
--- a/source/java/org/alfresco/service/cmr/repository/Period.java
+++ b/source/java/org/alfresco/service/cmr/repository/Period.java
@@ -126,6 +126,11 @@ public class Period implements Serializable
      */
     public Date getNextDate(Date date)
     {
+        if (periodType == null || periodType.length() == 0)
+        {
+            return null;
+        }
+        
         PeriodProvider provider = getProvider(periodType);
         return provider.getNextDate(date, expression != null ? expression : provider.getDefaultExpression());
     }