Merge "Use a more generic DB Error wording"