removed unnecessary try / catch blocks