Handle failing upserts and removes better