[COOK-3812] Switch to resource guards instead of just returning

https://tickets.opscode.com/browse/COOK-3812