Add resolvers for error and abort events