Guard try catch

This branch guards one try/catch pair and removes another that was unnecessary.