diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/proxy/ResourceRegistryClient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/proxy/ResourceRegistryClient.java
index fa7bd46..610c626 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/proxy/ResourceRegistryClient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/proxy/ResourceRegistryClient.java
@@ -6,8 +6,8 @@ import org.gcube.informationsystem.model.entity.Facet;
 import org.gcube.informationsystem.model.entity.Resource;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.InvalidQueryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
-import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.FacetNotFoundException;
-import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.ResourceNotFoundException;
+import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetNotFoundException;
+import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException;
 
 /**
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/proxy/ResourceRegistryClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/proxy/ResourceRegistryClientImpl.java
index 9ab3d1b..28f7a16 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/proxy/ResourceRegistryClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/proxy/ResourceRegistryClientImpl.java
@@ -29,8 +29,8 @@ import org.gcube.informationsystem.model.entity.Facet;
 import org.gcube.informationsystem.model.entity.Resource;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.InvalidQueryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
-import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.FacetNotFoundException;
-import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.ResourceNotFoundException;
+import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetNotFoundException;
+import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.rest.AccessPath;
 import org.slf4j.Logger;