1 files changed, 1 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
index 22429006aa..d1d0fb2b29 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
@@ -79,8 +79,7 @@ public class ExtensibleDomainRegistryFactory implements DomainRegistryFactory {
             }
         }
 
-        URI uri = URI.create(endpointRegistryURI);
-        String scheme = uri.getScheme();
+        String scheme = endpointRegistryURI == null ? null : URI.create(endpointRegistryURI).getScheme();
         if (scheme == null) {
             
             // See if there is a previously created registry for that domain