Try/Catch implementation fixes