Added extra try/catch for exceptions