diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java
index 83b7cc998d..ce0221f695 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java
@@ -247,10 +247,10 @@ protected String getSourceTablePrefix(Table table) {
         String prefix = (table.getSchema() != null ? table.getSchema() + "." : "");
         prefix = (table.getCatalog() != null ? table.getCatalog() + "." : "") + prefix;
         if (isBlank(prefix)) {
-            prefix = (symmetricDialect.getPlatform().getDefaultSchema() != null ? SymmetricUtils
+            prefix = (isNotBlank(symmetricDialect.getPlatform().getDefaultSchema()) ? SymmetricUtils
                     .quote(symmetricDialect, symmetricDialect.getPlatform().getDefaultSchema())
                     + "." : "");
-            prefix = (symmetricDialect.getPlatform().getDefaultCatalog() != null ? SymmetricUtils
+            prefix = (isNotBlank(symmetricDialect.getPlatform().getDefaultCatalog()) ? SymmetricUtils
                     .quote(symmetricDialect, symmetricDialect.getPlatform().getDefaultCatalog())
                     + "." : "") + prefix;
         }
@@ -264,10 +264,10 @@ protected String getSourceTablePrefix(TriggerHistory triggerHistory) {
                 symmetricDialect, triggerHistory.getSourceCatalogName()) + "." : "")
                 + prefix;
         if (isBlank(prefix)) {
-            prefix = (symmetricDialect.getPlatform().getDefaultSchema() != null ? SymmetricUtils
+            prefix = (isNotBlank(symmetricDialect.getPlatform().getDefaultSchema()) ? SymmetricUtils
                     .quote(symmetricDialect, symmetricDialect.getPlatform().getDefaultSchema())
                     + "." : "");
-            prefix = (symmetricDialect.getPlatform().getDefaultCatalog() != null ? SymmetricUtils
+            prefix = (isNotBlank(symmetricDialect.getPlatform().getDefaultCatalog()) ? SymmetricUtils
                     .quote(symmetricDialect, symmetricDialect.getPlatform().getDefaultCatalog())
                     + "." : "") + prefix;
         }