From 75e33c58d4307511defb1f7824e563433050e50d Mon Sep 17 00:00:00 2001
From: dtenwolde <dljtw98@gmail.com>
Date: Thu, 28 Nov 2024 16:43:51 +0100
Subject: [PATCH] Improve error handling

---
 src/core/functions/table/create_property_graph.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/functions/table/create_property_graph.cpp b/src/core/functions/table/create_property_graph.cpp
index f702d4b5..1ac26093 100644
--- a/src/core/functions/table/create_property_graph.cpp
+++ b/src/core/functions/table/create_property_graph.cpp
@@ -178,7 +178,7 @@ unique_ptr<FunctionData> CreatePropertyGraphFunction::CreatePropertyGraphBind(
 
         if (!table) {
           throw Exception(ExceptionType::INVALID,
-                          "Table " + vertex_table->catalog_name + "." + vertex_table->table_name + " not found");
+                          "Table " + (vertex_table->catalog_name.empty() ? DEFAULT_SCHEMA : vertex_table->catalog_name) + "." + vertex_table->table_name + " not found");
         }
 
         CheckPropertyGraphTableColumns(vertex_table, *table);
@@ -209,7 +209,7 @@ unique_ptr<FunctionData> CreatePropertyGraphFunction::CreatePropertyGraphBind(
                                                       edge_table->table_name, OnEntryNotFound::RETURN_NULL);
       if (!table) {
         throw Exception(ExceptionType::INVALID,
-                        "Table " + edge_table->catalog_name + "." + edge_table->table_name + " not found");
+                        "Table " + (edge_table->catalog_name.empty() ? DEFAULT_SCHEMA : edge_table->catalog_name) + "." + edge_table->table_name + " not found");
       }
 
       CheckPropertyGraphTableColumns(edge_table, *table);