diff --git a/src/main/java/org/etsi/osl/tmf/ri639/reposervices/ResourceRepoService.java b/src/main/java/org/etsi/osl/tmf/ri639/reposervices/ResourceRepoService.java
index e7ccecaf24c4b1172ee24358e05524caeb1d85b0..dada5c1286081f3740e6b0cc16ee285e6d7becea 100644
--- a/src/main/java/org/etsi/osl/tmf/ri639/reposervices/ResourceRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/ri639/reposervices/ResourceRepoService.java
@@ -459,29 +459,24 @@ public class ResourceRepoService {
   @Transactional
   public Resource getResourceEager(String id) {
     
-    Resource s = null;
-    try(Session session = sessionFactory.openSession()) {
-      Transaction tx = session.beginTransaction();
-      s = (Resource) session.get(Resource.class, id);
-      if (s == null) {
-        return this.findByUuid(id);// last resort
+      if (id == null || id.equals("")) {
+        return null;
       }
+    
+      Resource r = this.findByUuid(id);;
 
-      Hibernate.initialize(s.getRelatedParty());
-      Hibernate.initialize(s.getNote());
-      Hibernate.initialize(s.getResourceCharacteristic());
-      Hibernate.initialize(s.getResourceSpecification());
-      Hibernate.initialize(s.getResourceRelationship());
-      Hibernate.initialize(s.getAttachment());
-      Hibernate.initialize(s.getActivationFeature());
-
-
-      tx.commit();
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-
-    return s;
+      if (r == null) {
+        return null;
+      }
+      Hibernate.initialize(r.getRelatedParty());
+      Hibernate.initialize(r.getNote());
+      Hibernate.initialize(r.getResourceCharacteristic());
+      Hibernate.initialize(r.getResourceSpecification());
+      Hibernate.initialize(r.getResourceRelationship());
+      Hibernate.initialize(r.getAttachment());
+      Hibernate.initialize(r.getActivationFeature());
+   
+      return r;
   }