diff --git a/src/components/query/QueryIVOARegistry.js b/src/components/query/QueryIVOARegistry.js
index 3f4b5b6d54f85061ea388f3c94cbee497fc58d0b..9624ea3b8fe00e080fb103ad0786ef16631116d7 100644
--- a/src/components/query/QueryIVOARegistry.js
+++ b/src/components/query/QueryIVOARegistry.js
@@ -111,7 +111,6 @@ export default function QueryIVOARegistry() {
       queries = parseQueryForm(gui, formData, regPage);
     }
 
-
     queryMap.clear();
     queries.forEach((query) => {
       queryMap.set(query.catalog, {
@@ -126,12 +125,14 @@ export default function QueryIVOARegistry() {
         .get(url)
         .then((queryResponse) => {
           if(queryStep === "run-query") {
+              let vo_table_schema = queryResponse.data.results ? queryResponse.data.results[0] : null;
+              let status = queryResponse.data.results ? "fetched" : "error";
               queryMap.set(query.catalog, {
                   catalog: query.catalog,
                   service_type: query.service_type,
-                  vo_table_schema: queryResponse.data.results[0],
+                  vo_table_schema: vo_table_schema,
                   esapquery: query.esapquery,
-                  status: "fetched",
+                  status: status,
                   results: queryResponse.data,
               });
 
@@ -145,14 +146,14 @@ export default function QueryIVOARegistry() {
               results: queryResponse.data,
           })};
         })
-        .catch(() => {
+        .catch((error) => {
           queryMap.set(query.catalog, {
             catalog: query.catalog,
             service_type: query.service_type,
             vo_table_schema:"",
             esapquery: query.esapquery,
             status: "error",
-            results: null,
+            results: [error.message],
           });
         });
     });
diff --git a/src/components/services/query_results/IVOAResults.js b/src/components/services/query_results/IVOAResults.js
index 5c857822ce12896111ce01a331687b3be932c9f1..290d8e8d460e48cb351fd2c9614df563246ab756 100644
--- a/src/components/services/query_results/IVOAResults.js
+++ b/src/components/services/query_results/IVOAResults.js
@@ -20,12 +20,10 @@ export default function IVOAResults({ catalog }) {
   if (!queryMap.get(catalog)) return null;
 
   if (queryMap.get(catalog).status === "error") {
-      console.log(queryMap.get(catalog).results);
       if (queryMap.get(catalog).results == null){
           return (
             <Alert variant="danger">Unknown error while running this query!</Alert>
           );
-
       }
       if (queryMap.get(catalog).results[0].includes("ERROR")) {
           return (