Added try, catch back in