Changed exception handling to eliminate throws Exception clauses.

AFDP-111