Added try-catches