Merge "Split up DBError classes into their own files"