Refactor begin_and_rescue blocks
Eliminate unused begin_and_rescue method
Merge branch 'refactoring'