making events triggered on success consistent with those triggered on error

making events triggered on success consistent with those triggered on error