Updating Client to gracefully handle missing failure reasons