Improved CdbException handling

Change-Id: I1d3de72238ee788834abaa2d517c7975dc4986ac
Merge "Improved CdbException handling"