could get closed and terminated at the same time...
Merge pull request #32 from dimagi/sauri-updates

could get closed and terminated at the same time...