diff --git a/src/components/query/QueryIVOARegistry.js b/src/components/query/QueryIVOARegistry.js
index 61c08cccfbed36e58e038921d63df0859526c3db..1a5f84b387809dd869642549b15f93e5d3ed2d7a 100644
--- a/src/components/query/QueryIVOARegistry.js
+++ b/src/components/query/QueryIVOARegistry.js
@@ -91,7 +91,17 @@ export default function QueryIVOARegistry() {
                           status: "fetched",
                           results: queryResponse.data,
                       });
-                  })
+                  }).catch(() => {
+                      queryMap.set(query.catalog, {
+                          catalog: query.catalog,
+                          service_type: query.service_type,
+                          vo_table_schema:"",
+                          esapquery: query.esapquery,
+                          status: "error",
+                          results: queryResponse.data,
+                      });
+                  });
+
           }
           else {
             queryMap.set(query.catalog, {
diff --git a/src/components/services/query_results/IVOAResults.js b/src/components/services/query_results/IVOAResults.js
index d7f5ab7e5e463239b5f8dcac866c121df10bcfb5..e685f9d85eaa2720123c43d280dcafe958c82bd4 100644
--- a/src/components/services/query_results/IVOAResults.js
+++ b/src/components/services/query_results/IVOAResults.js
@@ -20,11 +20,22 @@ export default function IVOAResults({ catalog }) {
   if (!queryMap.get(catalog)) return null;
   console.log("VO service queryMap:", queryMap.get(catalog));
 
+  if (queryMap.get(catalog).status === "error") {
+      if (queryMap.get(catalog).results[0].includes("ERROR")) {
+          return (
+            <Alert variant="danger">{queryMap.get(catalog).results[0]}</Alert>
+          );
+      } else {
+          return (
+            <Alert variant="danger">Unknown error while running this query!</Alert>
+          );
+
+      }
+
+  }
+
   if (queryMap.get(catalog).status === "fetched") {
-    // if (queryMap.get(catalog).results[0].includes("ERROR"))
-    //   return (
-    //     <Alert variant="warning">{queryMap.get(catalog).results[0]}</Alert>
-    //   );
+
       try {
           if (queryMap.get(catalog).results.results.length === 0)
               return <Alert variant="warning">No matching results found!</Alert>;