Add some try catch blocks for good measure