Fix try / catch