Clean up error handling for wrapped actions