diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
index b1f8e871a..e545e35b4 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
@@ -2367,13 +2367,19 @@ public class SolrInformationServer implements InformationServer
 
             String transformationStatusFieldName = getSolrFieldNameForContentPropertyMetadata(propertyQName, 
                         AlfrescoSolrDataModel.ContentFieldType.TRANSFORMATION_STATUS);
-            newDoc.addField(transformationStatusFieldName, cachedDoc.getFieldValue(transformationStatusFieldName));
+            if (transformationStatusFieldName != null){
+                newDoc.addField(transformationStatusFieldName, cachedDoc.getFieldValue(transformationStatusFieldName));
+            }
             String transformationExceptionFieldName = getSolrFieldNameForContentPropertyMetadata(propertyQName,
                     AlfrescoSolrDataModel.ContentFieldType.TRANSFORMATION_EXCEPTION);
-            newDoc.addField(transformationExceptionFieldName, cachedDoc.getFieldValue(transformationExceptionFieldName));
-            String transformationTimeFieldName = getSolrFieldNameForContentPropertyMetadata(propertyQName, 
+            if (transformationExceptionFieldName != null){
+                newDoc.addField(transformationExceptionFieldName, cachedDoc.getFieldValue(transformationExceptionFieldName));
+            }
+            String transformationTimeFieldName = getSolrFieldNameForContentPropertyMetadata(propertyQName,
                         AlfrescoSolrDataModel.ContentFieldType.TRANSFORMATION_TIME);
-            newDoc.addField(transformationTimeFieldName, cachedDoc.getFieldValue(transformationTimeFieldName));
+            if (transformationTimeFieldName != null){
+                newDoc.addField(transformationTimeFieldName, cachedDoc.getFieldValue(transformationTimeFieldName));
+            }
 
             // Gets the new content docid and compares to that of the cachedDoc to mark the content as clean/dirty
             String fldName = getSolrFieldNameForContentPropertyMetadata(propertyQName,