Merge "Revert Message dependency from DB exception classes"