using ruby procs instead of begin/rescue
Merge branch 'develop'