Try Catch added