diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
index 6a05f0bccf..429eb42611 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
@@ -973,8 +973,8 @@ public class SolrQueryHTTPClient implements BeanFactoryAware, InitializingBean
 
                     PropertyDefinition propertyDef = QueryParserUtils.matchPropertyDefinition(searchParameters.getNamespace(),
                                 namespaceDAO, dictionaryService, interval.getField());
-                    if (propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME)
-                                || propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE))
+                    if (propertyDef != null && (propertyDef.getDataType().getName().equals(DataTypeDefinition.DATETIME)
+                                || propertyDef.getDataType().getName().equals(DataTypeDefinition.DATE)))
                     {
                         isDate = true;
                     }