Resolved a number of Checkstyle warnings.

AFDP-32
Implemented new validation exception scheme.

AFDP-32