Merge "Stop using the unholy trinity in DatabaseError"