Protect against transaction going away

Closes #317
Merge branch 'master' of github.com:baudehlo/Haraka