diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
index c2bfb30195..319862a847 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -1803,7 +1803,6 @@ public class BrokerService implements Service {
      * @throws IOException
      */
     protected Broker addInterceptors(Broker broker) throws Exception {
-        broker = new TransactionBroker(broker, getPersistenceAdapter().createTransactionStore());
         if (isSchedulerSupport()) {
             SchedulerBroker sb = new SchedulerBroker(broker, getSchedulerDirectoryFile());
             if (isUseJmx()) {
@@ -1823,6 +1822,7 @@ public class BrokerService implements Service {
             }
             broker = sb;
         }
+        broker = new TransactionBroker(broker, getPersistenceAdapter().createTransactionStore());
         if (isAdvisorySupport()) {
             broker = new AdvisoryBroker(broker);
         }
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
index e81b9c5ed5..c4f816b05a 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
@@ -204,8 +204,8 @@ public class TransportConnector implements Connector, BrokerServiceAware {
         brokerInfo.setBrokerId(broker.getBrokerId());
         brokerInfo.setPeerBrokerInfos(broker.getPeerBrokerInfos());
         brokerInfo.setFaultTolerantConfiguration(broker.isFaultTolerantConfiguration());
-        brokerInfo.setBrokerURL(server.getConnectURI().toString());
-        server.setAcceptListener(new TransportAcceptListener() {
+        brokerInfo.setBrokerURL(getServer().getConnectURI().toString());
+        getServer().setAcceptListener(new TransportAcceptListener() {
             public void onAccept(final Transport transport) {
                 try {
                     getDefaultTaskRunnerFactory().execute(new Runnable() {
@@ -236,8 +236,8 @@ public class TransportConnector implements Connector, BrokerServiceAware {
                 LOG.debug("Reason: " + error, error);
             }
         });
-        server.setBrokerInfo(brokerInfo);
-        server.start();
+        getServer().setBrokerInfo(brokerInfo);
+        getServer().start();
 
         DiscoveryAgent da = getDiscoveryAgent();
         if (da != null) {