Added proper wrapping around the primary driver action and the begin/rescue enclosure