Add catcher for error handling