diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 3efb52c9d2..22fa823d6b 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -541,4 +541,18 @@
         </property>
     </bean>
 
+	<!-- Repository helper class -->
+   <bean id="repositoryHelper" class="org.alfresco.repo.model.Repository">
+      <property name="transactionHelper" ref="retryingTransactionHelper" />
+      <property name="namespaceService" ref="namespaceService" />
+      <property name="nodeService" ref="nodeService" />
+      <property name="personService" ref="personService" />
+      <property name="fileFolderService" ref="fileFolderService" />
+      <property name="searchService" ref="searchService" />
+      <property name="tenantDeployerService" ref="tenantAdminService" />
+      <property name="avmService" ref="AVMService" />
+      <property name="companyHomeStore"><value>${spaces.store}</value></property>
+      <property name="companyHomePath"><value>/${spaces.company_home.childname}</value></property>
+   </bean>
+	
 </beans>
diff --git a/config/alfresco/model-specific-services-context.xml b/config/alfresco/model-specific-services-context.xml
index 8f03465bd8..0c831de690 100644
--- a/config/alfresco/model-specific-services-context.xml
+++ b/config/alfresco/model-specific-services-context.xml
@@ -112,19 +112,5 @@
          <ref bean="fileFolderService" />
       </property>
    </bean>
-   
-   <!-- Repository helper class -->
-   <bean id="repositoryHelper" class="org.alfresco.repo.model.Repository">
-      <property name="transactionHelper" ref="retryingTransactionHelper" />
-      <property name="namespaceService" ref="namespaceService" />
-      <property name="nodeService" ref="nodeService" />
-      <property name="personService" ref="personService" />
-      <property name="fileFolderService" ref="fileFolderService" />
-      <property name="searchService" ref="searchService" />
-      <property name="tenantDeployerService" ref="tenantAdminService" />
-      <property name="avmService" ref="AVMService" />
-      <property name="companyHomeStore"><value>${spaces.store}</value></property>
-      <property name="companyHomePath"><value>/${spaces.company_home.childname}</value></property>
-   </bean>
 
 </beans>
diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
index 52563c123a..a6b80530be 100644
--- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
+++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
@@ -989,11 +989,13 @@ public class SchemaBootstrap extends AbstractLifecycleBean
                 // thrown.  If it is thrown, the the update needs to be rerun as it will probably generate no SQL
                 // statements the second time around.
                 boolean updatedSchema = false;
+                boolean createdSchema = false;
+                
                 for (int i = 0; i < schemaUpdateLockRetryCount; i++)
                 {
                     try
                     {
-                        updateSchema(cfg, session, connection);
+                        createdSchema = updateSchema(cfg, session, connection);
                         updatedSchema = true;
                         break;
                     }
@@ -1009,8 +1011,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
                     throw new AlfrescoRuntimeException(ERR_PREVIOUS_FAILED_BOOTSTRAP);
                 }
                 
-                boolean create = updateSchema(cfg, session, connection);
-                
                 // Copy the executed statements to the output file
                 File schemaOutputFile = null;
                 if (schemaOuputFilename != null)
@@ -1035,7 +1035,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
                     LogUtil.info(logger, MSG_ALL_STATEMENTS, schemaOutputFile.getPath());
                 }
                 
-                if (! create)
+                if (! createdSchema)
                 {
                     // verify that all patches have been applied correctly 
                     checkSchemaPatchScripts(cfg, session, connection, validateUpdateScriptPatches, false);  // check scripts