(#1373) - handle errors with promises, reverts #695