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 e3025d0c14d26e52acc0c35457937186c776d7a6..88fcdbc5d39e44d852c4e5d1530d4a61df433c95 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,6 +65,7 @@ public class GeographicSiteManagementApiController implements GeographicSiteMana
                 Individual ind = individualRepoService.findByUsername(principal.getName());
 
                 GeographicSite gs= geographicSiteManagementService.findGeographicSiteByRelatedPartyId(ind.getId());
+                if (gs==null) gs =new GeographicSite();
                 return new ResponseEntity<GeographicSite>(gs,HttpStatus.OK);
 
             } else if ( authentication.getAuthorities().contains( new SimpleGrantedAuthority( UserRoleType.ROLE_ADMIN.getValue()  ) ) ){