diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/api/GeographicSiteManagementApiController.java b/src/main/java/org/etsi/osl/tmf/gsm674/api/GeographicSiteManagementApiController.java
index 22d27e0c3b01769b60fb4765e57dc197061cda11..3153156939bbc0a492c99dc5c13e8d5e62dc7beb 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/api/GeographicSiteManagementApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/api/GeographicSiteManagementApiController.java
@@ -65,14 +65,14 @@ public class GeographicSiteManagementApiController implements GeographicSiteMana
                 Individual ind = individualRepoService.findByUsername(principal.getName());
 
                 GeographicSite gs= geographicSiteManagementService.findGeographicSiteByRelatedPartyId(ind.getId());
-                return new ResponseEntity<>(gs,HttpStatus.OK);
+                return new ResponseEntity<GeographicSite>(gs,HttpStatus.OK);
 
             } else if ( authentication.getAuthorities().contains( new SimpleGrantedAuthority( UserRoleType.ROLE_ADMIN.getValue()  ) ) ){
+                return new ResponseEntity<GeographicSite>(geographicSiteManagementService.findGeographicSiteByUUID(id), HttpStatus.OK);
 
             }else {
                 return new ResponseEntity< GeographicSite >(HttpStatus.FORBIDDEN );
             }
-            return new ResponseEntity<>(geographicSiteManagementService.findGeographicSiteByUUID(id), HttpStatus.OK);
 
         } catch (Exception e) {
             log.error(COULD_NOT_SERIALIZE, e);
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/reposervices/GeographicSiteManagementService.java b/src/main/java/org/etsi/osl/tmf/gsm674/reposervices/GeographicSiteManagementService.java
index a13b70de0dd20bb62068a36669334fc5430835c3..607e1cab4cfb7d3d1eeb26a6009fda6a455abd13 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/reposervices/GeographicSiteManagementService.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/reposervices/GeographicSiteManagementService.java
@@ -39,6 +39,11 @@ public class GeographicSiteManagementService {
 
     public GeographicSite findGeographicSiteByRelatedPartyId(String uuid){
         Optional<GeographicSite> gs=geographicSiteManagementRepository.findByRelatedPartyId(uuid);
+        try {
+            log.info("Found geographic site from related party:{} , geographic site info: {}", uuid, gs.orElse(null).toString());
+        }catch(Exception e){
+            log.error("Error during fetch of geographic site info: {}", e.getMessage());
+        }
         return gs.orElse(null);
 
     }