DDF-238- cleaned up exception handling