Add error handling (finally)