Merge "Change CdbException to subclass Exception"