Merge "Mark DBError as runtime exception"