git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@702995 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 1 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index a0ec95023a..9dd26b5e8e 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
@@ -148,6 +148,6 @@ public class CompositeImpl extends ImplementationImpl implements Composite, Clon
     
     @Override
     public String toString(){
-        return getName().toString();
+    	return ( this.name != null ) ? getName().toString() : "null";
     }
 }