Add custom handler for action return