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 c14f7bfca9..d96fecf333 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
@@ -1103,9 +1103,11 @@ public class BrokerService implements Service {
         for (TransportConnector connector : transportConnectors) {
             try {
                 URI uri = connector.getConnectUri();
-                String scheme = uri.getScheme();
-                if (scheme != null) {
-                    answer.put(scheme.toLowerCase(), uri.toString());
+                if (uri != null) {
+                    String scheme = uri.getScheme();
+                    if (scheme != null) {
+                        answer.put(scheme.toLowerCase(), uri.toString());
+                    }
                 }
             } catch (Exception e) {
                 LOG.debug("Failed to read URI to build transportURIsAsMap", e);
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java
deleted file mode 100755
index b0e07338e8..0000000000
--- a/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.broker.store;
-
-import java.net.URI;
-
-import junit.framework.Test;
-
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.XARecoveryBrokerTest;
-
-/**
- * Used to verify that recovery works correctly against 
- * 
- * 
- */
-public class DefaultStoreXARecoveryBrokerTest extends XARecoveryBrokerTest {
-
-    public static Test suite() {
-        return suite(DefaultStoreXARecoveryBrokerTest.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    protected BrokerService createBroker() throws Exception {
-        return BrokerFactory.createBroker(new URI("broker://()/localhost?deleteAllMessagesOnStartup=true"));
-    }
-    
-    protected BrokerService createRestartedBroker() throws Exception {
-        return BrokerFactory.createBroker(new URI("broker://()/localhost"));
-    }
-    
-}
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreXARecoveryBrokerTest.java
deleted file mode 100644
index 280e74f4bd..0000000000
--- a/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreXARecoveryBrokerTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.store.kahadb;
-
-import java.io.File;
-import java.net.URI;
-
-import junit.framework.Test;
-
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.XARecoveryBrokerTest;
-
-/**
- * Used to verify that recovery works correctly against 
- * 
- * 
- */
-public class KahaDBStoreXARecoveryBrokerTest extends XARecoveryBrokerTest {
-
-    public static Test suite() {
-        return suite(KahaDBStoreXARecoveryBrokerTest.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService broker = new BrokerService();
-        KahaDBStore kaha = new KahaDBStore();
-        kaha.setDirectory(new File("target/activemq-data/kahadb"));
-        kaha.deleteAllMessages();
-        broker.setPersistenceAdapter(kaha);
-        return broker;
-    }
-    
-    protected BrokerService createRestartedBroker() throws Exception {
-        BrokerService broker = new BrokerService();
-        KahaDBStore kaha = new KahaDBStore();
-        kaha.setDirectory(new File("target/activemq-data/kahadb"));
-        broker.setPersistenceAdapter(kaha);
-        return broker;
-    }
-    
-}