Added more try/catch blocks.