diff --git a/pom.xml b/pom.xml
index ba7eb83d33..9b12675ed5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -534,7 +534,7 @@
       <alfresco-spring-webscripts.version>7.9</alfresco-spring-webscripts.version>
       <api.explorer.version>6.2.0</api.explorer.version>
       <!-- Set this here and override it in the community and enterprise modules. -->
-      <alfresco.version>0.0</alfresco.version>
+      <alfresco.min.version>0.0</alfresco.min.version>
 
       <skip.integrationtests>true</skip.integrationtests>
       <postgres.version>9.4.12</postgres.version>
@@ -694,7 +694,7 @@
                      <regexPropertySettings>
                         <regexPropertySetting>
                            <name>ags.module.repo.version.min</name>
-                           <value>${alfresco.version}</value>
+                           <value>${alfresco.min.version}</value>
                            <regex>(\d+)\.(\d+).*</regex>
                            <replacement>$1.$2</replacement>
                            <failIfNoMatch>false</failIfNoMatch>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 7b8c185887..ecd13ebaab 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -76,6 +76,7 @@
       <spring.version>5.1.8.RELEASE</spring.version>
 
       <alfresco.version>6.2.0-ga</alfresco.version>
+      <alfresco.min.version>6.1</alfresco.min.version>
       <share.version>6.2.0</share.version>
       <!-- The properties app.amp.* need to be set for share to work. -->
       <app.filtering.enabled>true</app.filtering.enabled>
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatch.java
index 1ebf45354d..10da1d1293 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatch.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatch.java
@@ -67,8 +67,11 @@ public class RMv33HoldAuditEntryValuesPatch extends AbstractModulePatch
     private void updatePropertyStringValueEntity(String fromStringValue, String toStringValue)
     {
         PropertyStringValueEntity propertyStringValueEntity = recordsManagementQueryDAO.getPropertyStringValueEntity(fromStringValue);
-        propertyStringValueEntity.setValue(toStringValue);
-        recordsManagementQueryDAO.updatePropertyStringValueEntity(propertyStringValueEntity);
+        if (propertyStringValueEntity != null)
+        {
+            propertyStringValueEntity.setValue(toStringValue);
+            recordsManagementQueryDAO.updatePropertyStringValueEntity(propertyStringValueEntity);
+        }
     }
 
 }
diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java
index 264e1e0831..58f76aeff5 100644
--- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java
+++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java
@@ -28,6 +28,7 @@
 package org.alfresco.module.org_alfresco_module_rm.patch.v33;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -104,6 +105,23 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest
         assertEquals(Long.valueOf(132_640_810L), deleteHoldPropertyStringValueEntity.getStringCrc());
     }
 
+    /**
+     * if there are no hold audit entries, the patch is executed with success; no entries are updated
+     */
+    @Test
+    public void patchRunWithSuccessWhenNoHoldEntries()
+    {
+        when(mockedRecordsManagementQueryDAO.getPropertyStringValueEntity("addToHold")).thenReturn(null);
+        when(mockedRecordsManagementQueryDAO.getPropertyStringValueEntity("removeFromHold")).thenReturn(null);
+        when(mockedRecordsManagementQueryDAO.getPropertyStringValueEntity("deleteHold")).thenReturn(null);
+
+        patch.applyInternal();
+
+        verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("addToHold");
+        verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("removeFromHold");
+        verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("deleteHold");
+        verify(mockedRecordsManagementQueryDAO, times(0)).updatePropertyStringValueEntity(any());
+    }
 }