1 files changed, 5 insertions, 3 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
index bd979aa4a3..c0687cd13f 100644
--- a/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
+++ b/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/registry/hazelcast/HazelcastDomainRegistry.java
@@ -669,9 +669,11 @@ public class HazelcastDomainRegistry extends BaseDomainRegistry implements Domai
     public String getRunningMember(String contributionURI, String compositeURI) {
         for (String m : runningCompositeOwners.keySet()) {
             Map<String, List<String>> rcs = runningCompositeOwners.get(m);
-            for (String curi : rcs.keySet()) {
-                if (rcs.get(curi).contains(compositeURI)) {
-                    return m;
+            if (rcs != null) {
+                for (String curi : rcs.keySet()) {
+                    if (rcs.get(curi).contains(compositeURI)) {
+                        return m;
+                    }
                 }
             }
         }