pulled in .cake error handling fixes