Add catch-exception draft