Merge "Made DB errors go to the exception log again"