Add try-catch-finally support