diff --git a/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java b/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
index 24a544b..a9bb3a5 100644
--- a/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
+++ b/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
@@ -27,7 +27,7 @@ public class CatalogueConfigurationFactory {
 		try {
 			FacetBasedISConfigurationProxy facetBasedISConfigurationProxy = FacetBasedISConfigurationProxyFactory.getInstance(context);
 			serviceCatalogueConfiguration = facetBasedISConfigurationProxy.getCatalogueConfiguration();
-		} catch(Exception e){
+		} catch(Throwable e){
 			GCoreISConfigurationProxy gCoreISConfigurationProxy = GCoreISConfigurationProxyFactory.getInstance();
 			serviceCatalogueConfiguration = gCoreISConfigurationProxy.getCatalogueConfiguration();
 		}
diff --git a/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
index 0275977..f5cbc1a 100644
--- a/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
+++ b/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
@@ -79,9 +79,10 @@ public class FacetBasedISConfigurationProxy extends ISConfigurationProxy<SimpleF
 	static {
 		ResourceRegistryQueryTemplateClient rrqtc = ResourceRegistryQueryTemplateClientFactory.create();
 		try {
+			queryTemplateName = null;
 			queryTemplateName = installQueryTemplate(rrqtc);
 		} catch (Exception e) {
-			throw new RuntimeException(e);
+			logger.error("Unable to install gcat Query Template on FacetBased IS.", e);
 		}
 	}
 	
@@ -180,6 +181,9 @@ public class FacetBasedISConfigurationProxy extends ISConfigurationProxy<SimpleF
 
 	public FacetBasedISConfigurationProxy(String context) {
 		super(context);
+		if(FacetBasedISConfigurationProxy.queryTemplateName==null) {
+			throw new RuntimeException(FacetBasedISConfigurationProxy.class.getSimpleName() + " cannot be used");
+		}
 		objectMapper = new ObjectMapper();
 		resourceRegistryClient = ResourceRegistryClientFactory.create();
 		resourceRegistryPublisher = ResourceRegistryPublisherFactory.create();