Added some try catches