1 files changed, 3 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
index a206a7d161..647cd12a32 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
@@ -854,6 +854,9 @@ public class EndpointReferenceBinderImpl implements EndpointReferenceBinder {
         if (builderContext != null){
             systemDefinitions = builderContext.getDefinitions();
         } else {
+            if (((RuntimeEndpoint)endpoint).getCompositeContext() == null) {
+                return true;
+            }
             systemDefinitions = ((RuntimeEndpoint)endpoint).getCompositeContext().getSystemDefinitions();
         }