Added some more try-catch after mysterious error