[minor] Added bailout support for error handling