CFY-491 handling failures differently now