Added more try-blocks for tricky code