Removing more unnecessary try/catch statements