diff --git a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
index e037232faa40489d20556f9c22fce46a195da356..b69e14aa5ec939ad97b4aa049cdb99c29e25f4aa 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
@@ -578,8 +578,12 @@ public class ServiceRepoService {
         }
 		
 		if (serviceCharacteristicChanged) {
-
-          if (service.getServiceCharacteristicByName("_DETAILED_NOTES_") != null) {
+          
+          Characteristic noteCheck = service.getServiceCharacteristicByName("_DETAILED_NOTES_");
+          if ( noteCheck!= null 
+              && noteCheck.getValue() != null
+              && noteCheck.getValue().getValue() != null
+              && !noteCheck.getValue().getValue().equals("")) {
             Note noteItem = new Note();
             noteItem.setText("Service Characteristic changed: " + charChangedForNotes );
             noteItem.setAuthor("SIM638-API");
@@ -643,6 +647,11 @@ public class ServiceRepoService {
 			this.addServiceActionQueueItem(saqi);
 		}
 		
+		
+		
+		
+		
+		
         /*
          * Update any parent service
          */
@@ -950,6 +959,8 @@ public class ServiceRepoService {
 	public ServiceActionQueueItem  addServiceActionQueueItem(@Valid ServiceActionQueueItem item) {
 		logger.debug("Will add ServiceActionQueueItem ServiceRefId: " + item.getServiceRefId() );
 		
+		
+		
 		//find any similar action inqueue and delete them, so to keep this one as the most recent
 		List<ServiceActionQueueItem> result = this.serviceActionQueueRepo.findByServiceRefIdAndAction(item.getServiceRefId(), item.getAction());
         logger.debug("Will add ServiceActionQueueItem ServiceRefId result: " +result.size() );
@@ -1157,7 +1168,11 @@ public class ServiceRepoService {
                     supd.addServiceCharacteristicItem( cNew );  
                 }
                 
-                if (as.getServiceCharacteristicByName("_DETAILED_NOTES_") != null) {
+                Characteristic noteCheck = as.getServiceCharacteristicByName("_DETAILED_NOTES_");
+                if ( noteCheck!= null 
+                    && noteCheck.getValue() != null
+                    && noteCheck.getValue().getValue() != null
+                    && !noteCheck.getValue().getValue().equals("")) {
                   Note n = new Note();
                   n.setText(stateText + "Supporting Resource changed with id: " + res.getId());
                   n.setAuthor( "SIM638-API" );