1 files changed, 12 insertions, 9 deletions
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
index 63b25322e5..38a7dd130c 100644
--- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
+++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
@@ -254,16 +254,19 @@ public class RemoteServiceAdminImpl implements RemoteServiceAdmin, ManagedServic
         if (rsaEvent.getExportReference() != null) {
             ep = rsaEvent.getExportReference().getExportedEndpoint();
         }
-        props.put("endpoint.service.id", ep.getServiceId());
-        props.put("endpoint.framework.uuid", ep.getFrameworkUUID());
-        props.put("endpoint.id", ep.getId());
-        props.put("objectClass", ep.getInterfaces());
-        props.put("service.imported.configs", ep.getConfigurationTypes());
-        props.put("timestamp", Long.valueOf(System.currentTimeMillis()));
-        Object bindings = ep.getProperties().get("org.osgi.sca.bindings");
-        if (bindings != null) {
-            props.put("org.osgi.sca.bindings", bindings);
+        
+        if (ep != null) {
+            props.put("endpoint.service.id", ep.getServiceId());
+            props.put("endpoint.framework.uuid", ep.getFrameworkUUID());
+            props.put("endpoint.id", ep.getId());
+            props.put("objectClass", ep.getInterfaces());
+            props.put("service.imported.configs", ep.getConfigurationTypes());
+            Object bindings = ep.getProperties().get("org.osgi.sca.bindings");
+            if (bindings != null) {
+                props.put("org.osgi.sca.bindings", bindings);
+            }
         }
+        props.put("timestamp", Long.valueOf(System.currentTimeMillis()));
         props.put("event", rsaEvent);
         return new Event(topic, props);
     }