diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java
index a123c4cdfd..e06260f1bd 100644
--- a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java
+++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java
@@ -205,6 +205,8 @@ public Database readDatabase(String catalog, String schema, String[] tableTypes)
     public Table readTableFromDatabase(String catalogName, String schemaName, String tableName) {
         String originalFullyQualifiedName = Table.getFullyQualifiedTableName(catalogName,
                 schemaName, tableName);
+        catalogName = catalogName == null ? getDefaultCatalog() : catalogName;
+        schemaName = schemaName == null ? getDefaultSchema() : schemaName;        
         Table table = ddlReader.readTable(catalogName, schemaName, tableName);
         if (table == null && metadataIgnoreCase) {
             if (isStoresUpperCaseIdentifiers()) {