Added try / catch