diff --git a/src/client/containers/SemanticPortal.js b/src/client/containers/SemanticPortal.js
index 42712868405303f0497faf49acf66a1604bbad56..38df4577f6f9d5b74990ea90155c7716280b62cd 100644
--- a/src/client/containers/SemanticPortal.js
+++ b/src/client/containers/SemanticPortal.js
@@ -641,7 +641,9 @@ const SemanticPortal = props => {
                       perspectiveID={knowledgeGraphMetadataSource}
                       resultClass='knowledgeGraphMetadata'
                       fetchKnowledgeGraphMetadata={props.fetchKnowledgeGraphMetadata}
-                      knowledgeGraphMetadata={props[knowledgeGraphMetadataSource].knowledgeGraphMetadata}
+                      knowledgeGraphMetadata={props[knowledgeGraphMetadataSource]
+                        ? props[knowledgeGraphMetadataSource].knowledgeGraphMetadata
+                        : null}
                     />
                     {intl.getHTML('aboutThePortalPartTwo')}
                   </TextPage>
diff --git a/src/server/sparql/FacetResults.js b/src/server/sparql/FacetResults.js
index 5a29697b4d1f18ddb06c7f3dfdf667d62148c210..4996f63fb8761366eba0b0656873a50146d77ce7 100644
--- a/src/server/sparql/FacetResults.js
+++ b/src/server/sparql/FacetResults.js
@@ -105,11 +105,14 @@ export const getAllResults = ({
   fromID = null,
   toID = null
 }) => {
-  let perspectiveConfig
-  if (perspectiveID) {
-    perspectiveConfig = backendSearchConfig[perspectiveID]
-  } else {
-    perspectiveConfig = backendSearchConfig[facetClass]
+  const finalPerspectiveID = perspectiveID || facetClass
+  const perspectiveConfig = backendSearchConfig[finalPerspectiveID]
+  if (perspectiveConfig === undefined) {
+    console.log(`Error: config not found for perspective "${finalPerspectiveID}"`)
+    return Promise.resolve({
+      data: null,
+      sparqlQuery: ''
+    })
   }
   const {
     endpoint,
@@ -119,7 +122,7 @@ export const getAllResults = ({
   } = perspectiveConfig
   const resultClassConfig = perspectiveConfig.resultClasses[resultClass]
   if (resultClassConfig === undefined) {
-    console.log(`Error: result class "${resultClass}" not defined for perspective "${perspectiveID}"`)
+    console.log(`Error: result class "${resultClass}" not defined for perspective "${finalPerspectiveID}"`)
     return Promise.resolve({
       data: null,
       sparqlQuery: ''