Merge "Improve exception message in DatabaseDomain"