diff --git a/src/main/java/org/etsi/osl/metrico/services/MetricoService.java b/src/main/java/org/etsi/osl/metrico/services/MetricoService.java
index f4c35278ce35abd1636c21dd40a39539c045ca0c..897495312f13f017fa193d776b9aa07711ecaaab 100644
--- a/src/main/java/org/etsi/osl/metrico/services/MetricoService.java
+++ b/src/main/java/org/etsi/osl/metrico/services/MetricoService.java
@@ -10,6 +10,7 @@ import org.etsi.osl.metrico.model.Job;
 import org.etsi.osl.metrico.prometheus.PrometheusQueries;
 import org.etsi.osl.metrico.repo.JobRepository;
 import org.etsi.osl.metrico.reposervices.JobRepoService;
+import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.ELifecycle;
 import org.etsi.osl.tmf.common.model.EValueType;
 import org.etsi.osl.tmf.common.model.service.ResourceRef;
@@ -195,7 +196,12 @@ public class MetricoService extends RouteBuilder {
       
       MeasurementCollectionJob givenMCJ = retrieveMeasurementCollectionJob( mcjevent.getEvent().getMeasurementCollectionJob().getId() );
 
-      startPeriodicQueryToPrometheus(givenMCJ);
+      if ( givenMCJ != null) {
+        startPeriodicQueryToPrometheus(givenMCJ);        
+      } else {
+
+        logger.error("=======> CANNOT retrieve Measurement Collection Job with mcjId = " + mcjevent.getEvent().getMeasurementCollectionJob().getId()  +" from activeMQ");
+      }
   }
 
     public MeasurementCollectionJob retrieveMeasurementCollectionJob(String mcjId) {
@@ -241,6 +247,14 @@ public class MetricoService extends RouteBuilder {
         logger.debug("updateRelatedResource resRef = " + resRef.getId() );
         
         ResourceUpdate rup = new ResourceUpdate();
+        org.etsi.osl.tmf.ri639.model.Characteristic resCharacteristicItem =  new org.etsi.osl.tmf.ri639.model.Characteristic();
+        resCharacteristicItem.setName( "_MT_MCJ_REF" );
+        resCharacteristicItem.setValueType( "TEXT" );
+        Any val = new Any();
+        val.setValue( givenMCJ.getUuid() );
+        val.setAlias( "" );
+        resCharacteristicItem.setValue( val );
+        rup.addResourceCharacteristicItem(  resCharacteristicItem );
         
         if ( givenMCJ.getExecutionState().equals( ExecutionStateType.FAILED  ) ) {
           rup.setResourceStatus( org.etsi.osl.tmf.ri639.model.ResourceStatusType.SUSPENDED );