Part of fix for #79 - moving deactivate() and notifyCommit() into finally block