Revert "Added throw/catch for exceptions"

This reverts commit d086ec4a54a1e82c44c7b62b2d0c7e34d2a7af45.