diff --git a/AmalgamationTool/DynamORM.Amalgamation.cs b/AmalgamationTool/DynamORM.Amalgamation.cs
index 9da8b88..aaefba5 100644
--- a/AmalgamationTool/DynamORM.Amalgamation.cs
+++ b/AmalgamationTool/DynamORM.Amalgamation.cs
@@ -6026,7 +6026,7 @@ namespace DynamORM
             IsDisposed = false;
             Database = database;
             TableName = Database.StripName(table);
-            OwnerName = Database.StripName(owner);
+            OwnerName = owner != null ? Database.StripName(owner) : string.Empty;
             TableType = null;
 
             BuildAndCacheSchema(keys);
diff --git a/DynamORM/DynamicTable.cs b/DynamORM/DynamicTable.cs
index 2ddc673..e333dd5 100644
--- a/DynamORM/DynamicTable.cs
+++ b/DynamORM/DynamicTable.cs
@@ -247,7 +247,7 @@ namespace DynamORM
             IsDisposed = false;
             Database = database;
             TableName = Database.StripName(table);
-            OwnerName = Database.StripName(owner);
+            OwnerName = owner != null ? Database.StripName(owner) : string.Empty;
             TableType = null;
 
             BuildAndCacheSchema(keys);