Added try catches