diff --git a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
index 95c66213cd6bea1c85bf72399610089a8d613ed3..6763c70a391ec0b5a4b221e4d65d2c8b20cafb6b 100644
--- a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
+++ b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
@@ -467,7 +467,12 @@ public class KubernetesClientResource {
         }
       }));
 
-      gkr.getMetadata().setName( (String) headers.get("org.etsi.osl.prefixName")) ;
+      
+      String crName = (String) headers.get("org.etsi.osl.prefixName");
+      if ( crName == null || crName.isBlank() || crName.isEmpty()   ) {
+        return "ERROR Custom Resource Name is empty";        
+      }
+      gkr.getMetadata().setName( crName  ) ;
       String nameSpacename = (String) headers.get("org.etsi.osl.namespace");            
       if ( gkr.getMetadata().getNamespace() == null ) {
         gkr.getMetadata().setNamespace(nameSpacename);
@@ -475,7 +480,8 @@ public class KubernetesClientResource {
 
       logger.debug("Object to delete:{}", Serialization.asYaml( gkr ) );
       Resource<GenericKubernetesResource> dummyObject = kubernetesClient.resource( gkr );      
-      
+
+      logger.debug("============ DELETE crspec: dummyObject {} =============", dummyObject.toString() );
       List<StatusDetails> result = dummyObject.delete(); 
       logger.debug("============ DELETE crspec: result {} =============", result.toString() );