diff --git a/src/main.c b/src/main.c
index d8901fe4..c2f0aed4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -145,6 +145,7 @@ int main(int argc, char *argv[])
     }
 
     DBufInit(&(LastTrigger.tags));
+    LastTrigger.infos = NULL;
     ClearLastTriggers();
 
     atexit(exitfunc);
@@ -1945,7 +1946,9 @@ void
 FreeTrig(Trigger *t)
 {
     DBufFree(&(t->tags));
-    FreeTrigInfoChain(t->infos);
+    if (t->infos) {
+        FreeTrigInfoChain(t->infos);
+    }
     t->infos = NULL;
 }
 
@@ -1972,8 +1975,7 @@ ClearLastTriggers(void)
     LastTrigger.warn[0] = 0;
     LastTrigger.omitfunc[0] = 0;
     LastTrigger.passthru[0] = 0;
-    DBufFree(&(LastTrigger.tags));
-    LastTrigger.infos = NULL;
+    FreeTrig(&LastTrigger);
     LastTimeTrig.ttime = NO_TIME;
     LastTimeTrig.delta = NO_DELTA;
     LastTimeTrig.rep   = NO_REP;
@@ -1993,10 +1995,19 @@ SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigt
 void
 SaveLastTrigger(Trigger const *t)
 {
-    DBufFree(&(LastTrigger.tags));
+    FreeTrig(&LastTrigger);
     memcpy(&LastTrigger, t, sizeof(LastTrigger));
+
+    /* DON'T hang on to the invalid info chain! */
+    LastTrigger.infos = NULL;
     DBufInit(&(LastTrigger.tags));
+
     DBufPuts(&(LastTrigger.tags), DBufValue(&(t->tags)));
+    TrigInfo *cur = t->infos;
+    while(cur) {
+        AppendTrigInfo(&LastTrigger, cur->info);
+        cur = cur->next;
+    }
 }
 
 void
diff --git a/src/trigger.c b/src/trigger.c
index 4335387e..5a0c6841 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -706,7 +706,9 @@ FreeTrigInfo(TrigInfo *ti)
 {
     if (ti->info) {
         free( (void *) ti->info);
+        ti->info = NULL;
     }
+    ti->next = NULL;
     free(ti);
 }