diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
index 215b8dede9..98e2fe39bd 100644
--- a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
+++ b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -85,6 +85,10 @@ public void insertReloadEvent(final Node targetNode, final Trigger trigger,
             final String overrideInitialLoadSelect) {
         final TriggerHistory history = configurationService.getLatestHistoryRecordFor(trigger.getTriggerId());
 
+        if (history == null) {
+            throw new RuntimeException("Cannot find history for trigger " + trigger.getTriggerId() + ", "
+                    + trigger.getSourceTableName());
+        }
         // initial_load_select for table can be overridden by populating the row_data
         Data data = new Data(history.getSourceTableName(), DataEventType.RELOAD, overrideInitialLoadSelect,
                 null, history);