Add support for handling failing activities