fix: unwatch should be called only if an error occurred during the transaction#332