Add Try/Catch with comments