DDF-107 - Cleaned up catch/log/throw logic per code review comments