Exception handling restructuring.

Exception handling restructuring.
DTO restructuring.