Probably should mention which templated failed in the log
Adds need to occur before waits.

Not sure how (or if for that matter) this didn't break.