Add try/catch/finally