Added some more try/catch