Add better failure error messages