diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
index 21905bc79a..e66333273a 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-patch-context.xml
@@ -59,6 +59,7 @@
        <property name="sinceVersion" value="2.0"/>
        <property name="appliesFromVersion" value="2.0"/>
        <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
+       <property name="siteService" ref="SiteService" />
    </bean>
 
 </beans>
\ No newline at end of file
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java
index 076ec3860c..24051c605f 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java
@@ -25,6 +25,7 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
 import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
 import org.alfresco.repo.module.AbstractModuleComponent;
+import org.alfresco.service.cmr.site.SiteService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.BeanNameAware;
@@ -47,6 +48,9 @@ public class RMv2SavedSearchPatch extends AbstractModuleComponent
     /** Records management search service */
     private RecordsManagementSearchService recordsManagementSearchService;
     
+    /** Site service */
+    private SiteService siteService;
+    
     /**
      * @param recordsManagementSearchService    records management search service
      */
@@ -55,6 +59,14 @@ public class RMv2SavedSearchPatch extends AbstractModuleComponent
         this.recordsManagementSearchService = recordsManagementSearchService;
     }
     
+    /**
+     * @param siteService   site service
+     */
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
     /**
      * @see org.alfresco.repo.module.AbstractModuleComponent#executeInternal()
      */
@@ -66,30 +78,32 @@ public class RMv2SavedSearchPatch extends AbstractModuleComponent
             logger.debug("RM Module RMv2SavedSearchPatch ...");
         }
         
-        // get the saved searches
-        List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(RM_SITE_ID);
-        
-        if (logger.isDebugEnabled() == true)
+        if (siteService.getSite(RM_SITE_ID) != null)
         {
-            logger.debug("   ... updating " + savedSearches.size() + " saved searches");
-        }
-        
-        for (SavedSearchDetails savedSearchDetails : savedSearches)
-        {
-            // re-save each search so that the query is regenerated correctly
-            recordsManagementSearchService.deleteSavedSearch(RM_SITE_ID, savedSearchDetails.getName());
-            recordsManagementSearchService.saveSearch(RM_SITE_ID, 
-                                                      savedSearchDetails.getName(), 
-                                                      savedSearchDetails.getDescription(), 
-                                                      savedSearchDetails.getSearch(), 
-                                                      savedSearchDetails.getSearchParameters(), 
-                                                      savedSearchDetails.isPublic());            
+            // get the saved searches
+            List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(RM_SITE_ID);
+            
+            if (logger.isDebugEnabled() == true)
+            {
+                logger.debug("   ... updating " + savedSearches.size() + " saved searches");
+            }
+            
+            for (SavedSearchDetails savedSearchDetails : savedSearches)
+            {
+                // re-save each search so that the query is regenerated correctly
+                recordsManagementSearchService.deleteSavedSearch(RM_SITE_ID, savedSearchDetails.getName());
+                recordsManagementSearchService.saveSearch(RM_SITE_ID, 
+                                                          savedSearchDetails.getName(), 
+                                                          savedSearchDetails.getDescription(), 
+                                                          savedSearchDetails.getSearch(), 
+                                                          savedSearchDetails.getSearchParameters(), 
+                                                          savedSearchDetails.isPublic());            
+            }
         }
         
         if (logger.isDebugEnabled() == true)
         {
             logger.debug("   ... complete");
-        }
-        
+        }        
     }
 }