wip: Fixing promise rescue propagation