Had to reinclude the begin, rescue block for production