minor changes with try / catch