Added try / excepts